add upvote button, begin css
merge
Merge branch 'master' of https://github.com/tjhernandez34/OneTaste

merge