Merge branch 'feature/choice-em-up' into develop
Merge branch 'master' into develop
yey voting fun!
Merge pull request #3 from 6hoursdaily/feature/voting-starts-now

Feature/voting starts now