Merge branch 'master' of heroku.com:mytraveljournal
Merge branch 'master' of heroku.com:mytraveljournal