Files for mrr2578 and eh8974.
Merge branch 'master' of https://github.com/cs371p-fall-2014/voting-tests