working GUI commit
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git

Conflicts:
	src/gUIModule/GUI.java