pushing to Heroku
fixing merge conflicts
Merge branch 'master' of github.com:chuckrea/giftr