Tested Gui
Merge branch 'ft-GUIDesign' of http://github.com/ijoshftw/ufm-reckoning into ft-GUIDesign

Conflicts:
	src/main/java/nl/joshuaslik/UFMReckoning/gui/Main.java