Git made me do it...
Merge branch 'master' of https://github.com/tbishop9870/ChckDsk

Conflicts:
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta