Prototype 1 Complete
Merge branch 'master' of https://github.com/Chanisco/GameJam_WarmingUp

Conflicts:
	Warmyparmy/Assembly-CSharp-vs.csproj
	Warmyparmy/Assembly-CSharp.csproj
	Warmyparmy/Assets/Scenes/TestChanisco.unity
	Warmyparmy/Warmyparmy-csharp.sln
	Warmyparmy/Warmyparmy.sln
	Warmyparmy/Warmyparmy.userprefs