switched Travis tag to 'markdown'
Merge branch 'master' of heroku.com:isitwarmenough into newBranch