Working base
Merge branch 'master' of github.com:Thinkful-OpenSource/voteful