trying to cause a merge conflict again
Merge branch 'master' into BranchBuild

Conflicts:
	test/MainControllerTest.java
Merge branch 'master' into BranchBuild

Conflicts:
	test/MainControllerTest.java
Merge pull request #3 from balihoo/BranchBuild

Branch build