hk9799 & dmh2879
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests