Conflict resolve
Merge branch 'master' of https://github.com/jritter/VoterApp.git