nix
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	bin/classes/com/example/swetest/InputNotification.class
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering
Notifications funktionieren jetzt
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	bin/classes/com/example/swetest/InputNotification.class
	bin/classes/com/example/swetest/Statistic.class