Finished Website
Merge branch 'master' of https://github.com/charlesx2013/VoteApp