trolol
Merge branch 'master' of https://github.com/izi01/TestRepo

Conflicts:
	TestProjectGit/src/TgClass.java