updated controllers
Merge branch 'master' of github.com:W13-CIS422/Voting