Add content
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/Standard Assets/Character Controllers/Sources/Scripts/ThirdPersonController.cs
	Assets/Start.unity