test commit 2
Merge branch 'master' of https://github.com/BPfuelb/TestGit

Conflicts:
	Projekt/src/MainClass.java