Kim kn6254 and Thien thv92 push together. World is peace!
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests