gui modified
Merge branch 'master' of
https://github.com/supergonteta/swp-prototyp.git

Conflicts:
	stundenplan.git/src/main/java/de/unibremen/swp/stundenplan/gui/StartFrame.java