Test files Tomas Rodriguez and David Aguirre
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests