Mark W. and Bruno V. with the tests
Merge branch 'master' of github.com:cs371p-fall-2013/cs371p-voting-tests