Fixed the test
Update README.md
breaking master, hopefully causing a merge conflict for PR #2
Merge branch 'master' of https://github.com/balihoo/PlayGitFlowTravisHerokuTest
Merge pull request #2 from balihoo/FixedBranchBuild

Fixed branch build
Merge branch 'master' into BranchBuild

Conflicts:
	test/MainControllerTest.java