Update application.html.erb
voting feature specs passed, need to refactor
voting feature
Merge branch 'master' into vote
vote feature working, need to refactor
fixed merge conflicts