dfssat<jsjt<aJSJta<sTA<<STas<TY
Merge branch 'master' of https://github.com/Pepsinator/SU

Conflicts:
	src/kontroller/AlarmKontroller.java
	src/modell/Alarm.java