Committing just to pull, working on friends list
resolve merge conflicts
Merge branch 'master' of https://github.com/jakeesmael/callouts
pull to keep working
resolve merge conflicts
commit to commit to heroku
Push so jake can help debug
Merge branch 'master' of https://github.com/jakeesmael/callouts