Voting added + some changes made
Merge branch 'master' of https://github.com/RudigerRoach/301_main_emma