First commit
Merge branch 'master' of github.com:sadjehwty/galaxy

Conflicts:
	src/org/macrobug/galaxy/gui/Gui.java