third branch 16:10
Merge branch 'thridBranch'

Conflicts:
	GitTest/src/test/Test.java