These are the files that it changes!
Merge branch 'master' of https://github.com/tbishop9870/ChckDsk

Conflicts:
	Assets/CharControl.controller