Merge branch 'master' of heroku.com:jamwithme
Merge branch 'master' of github.com:anair13/jam-with-me