some changes
Merge branch 'master' of https://github.com/vschaefer/WBA2.git

Conflicts:
	Phase1/src/aufgabe1.xml