Merge branch 'master' of C:\Users\Marvin\Desktop\SMUG_zeug\SMUG2000 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Menu.java
Schinken