base gui
Merge branch 'master' of github.com:sadjehwty/asmodeo into gui

Conflicts:
	src/dev/macrobug/asmodeo/gui/Gui.java