updated
Merge branch 'master' of github.com:jsjohnst/hack-day.vote