new Print
Merge branch 'localBranch' into branchTest

Conflicts:
	gitDemoTest/src/gitDemoTest/DemoTestFirst.java
Merge remote-tracking branch 'origin/master' into localBranch
NEW COMMIT