test konflikt
Merge branch 'master' of
https://github.com/lukashaidacher/TestGitHubRep.git

Conflicts:
	TestGitProject/src/at/testProject/HelloWorld.java