ausgabe 1
Merge branch 'master' of https://github.com/mi1069/WBA2.git

Conflicts:
	Phase 1/src/newclass.java