shsaey stuff
GUIPanel. these changes will be deleted
Merge branch 'master' of https://github.com/DrTeePot/The-Mahogany-Engine

Conflicts:
	src/culminating_engine/Culminating_Engine.java
conflict resolution