Fixing merge conflict
merging
Merge branch 'master' of https://github.com/sfrink/CERTUS-Server
Merge branch 'master' of https://github.com/sfrink/CERTUS-Server
Merge branch 'master' of https://github.com/sfrink/CERTUS-Server
added adding candidate/election functionality (not yet tested)