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

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	bin/swetest.apk
	gen/com/example/swetest/R.java
ignore list hinzugefügt
SetAlarms.class has functionality now
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering