master2 16:33
master 16:33
Merge branch 'master2'

Conflicts:
	GitTest/src/test/Test.java