Implemented Flemmings update with my smaller changes.
Merge branch 'master' of https://github.com/Gebuz/Group-B into feature/GUI

Conflicts:
	gui/Controller.java
	gui/MapPanel.java
	gui/MapView.java