fix3
fix2
Merge branch 'develop' of https://github.com/Kasokaso/test.git into
develop

Conflicts:
	TestGitProject/src/test/kaso/Test.java