updating javadoc comments
fix timeout for evote test
Merge branch 'master' of github.com:joshualee/cs262_final_project