Old
Merge branch 'master' of https://github.com/topack/ThirdPerson

Conflicts:
	Assets/Scripts/Test.cs