Prep for hunch melee
Merge branch 'master' of https://github.com/crobinson33/SpaceBagel

Conflicts:
	SpaceBagel.sln