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