Solved merge conflict for index.html
Merge branch 'master' of github.com:sysofwan/voteapp