Added Level 3 changes and made NPCTalk Changes
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/BaseLevel.unity
	Assets/Scripts/NPCTalk.cs
Made some small changes.
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/New Terrain.asset
	Assets/Scripts/NPCTalk.cs