Made Changes
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/BaseLevel.unity