Merge branch 'master' of github.com:abawgus/Dish-Samurai
Cleaned up stuff.
Merge branch 'master' of github.com:abawgus/Dish-Samurai

Conflicts:
	Dish-Samurai/Assets/SourceObjects/Hero.prefab