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

Conflicts:
	WBA2_Phase1/src/Main.java