?
Gui update
Merge branch 'master' of https://github.com/simonlindberg/db-projekt

Conflicts:
	src/gui/GUI.java