Timetable
Merge branch 'master' of https://github.com/OliverBe/stundenplanswp.git

Conflicts:
	stundenplan.git/src/main/java/de/unibremen/swp/stundenplan/Stundenplan.java
Merge branch 'master' of https://github.com/OliverBe/stundenplanswp.git