Scott's changes
Scott's changes

Conflicts:
	FinalProjectV1/Assets/Animations.meta
	FinalProjectV1/Assets/InControl/Source/VersionInfo.cs