Div
Merge branch 'master' of https://github.com/IT1901Gruppe15/IT1901Gruppe15

Conflicts:
	src/gui/GUIController.java