I don't remember what I changed
Merge branch 'master' of github.com:mattkuo/ggj14

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/CharacterMove.cs