breaking the branch again
Merge branches 'master' and 'master' of https://github.com/balihoo/PlayGitFlowTravisHerokuTest into BranchBuild
Fixed the test
Merge pull request #2 from balihoo/FixedBranchBuild

Fixed branch build