Adding files for nmb642 and rjn367
Merge branch 'master' of https://github.com/cs371p-fall-2013/cs371p-voting-tests
Merge branch 'master' of https://github.com/cs371p-fall-2013/cs371p-voting-tests