buttons in the right places
fixed more merge conflicts
working on vote buttons. is_buttons?
Merge branch 'master' of github.com:chuckrea/giftr