Merge branch 'master' of heroku.com:whispering-river-1524
Merge branch 'master' of https://github.com/timpei/Swear-Jar-Server
Merge branch 'master' of https://github.com/timpei/Swear-Jar-Server
Merge branch 'master' of heroku.com:whispering-river-1524