breaking master, hopefully causing a merge conflict for PR #2
Merge branch 'master' of https://github.com/balihoo/PlayGitFlowTravisHerokuTest