ALL OF THE COMMITS!
Tried again
Merge branch 'master' of https://github.com/Chanisco/GameJam_WarmingUp

Conflicts:
	Warmyparmy/Assets/Scenes/TestChanisco.unity