cool shit
Merge branch 'master' of https://github.com/dwarfcrank/GlowingOctoNemesis

Conflicts:
	Assets/GuiTest.cs