Text geändert
Merge branch 'master' of https://github.com/kernelpanix/wba2_ss13.git

Conflicts:
	WBA2_SS13_Phase1/src/Main.java
	
Konflikt gelöst