ALOT OF COMMITS I CHOOSE YOU!
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