master commit
Merge branch 'branch2'

Conflicts:
	testGIT/src/Main.java
Merge branch 'branch2'

Conflicts:
	testGIT/src/Main.java
Changed line