new commit to localBranch
Merge branch 'localBranch' into branchTest

Conflicts:
	gitDemoTest/src/gitDemoTest/DemoTestFirst.java