Kollision inc.
error!!
Merge branch 'master' of https://github.com/mintbox/WBA2_SS13_Oli.git

Conflicts:
	WBA2_Phase1/bin/Aufgabe_3a.xml
	WBA2_Phase1/src/Aufgabe_3a.xml