Revert "fix2"

This reverts commit 037f533d1cfa830c8209057723bbc0ea77d13f6d.
master1
master11
fix2
dev1
dev11
Conflicts:
	TestGitProject/src/test/kaso/Test.java
Merge branch 'develop' of https://github.com/Kasokaso/test.git into
develop

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