Fixing NPC bug and adding scene
Merge branch 'master' of https://github.com/RCARL/CS380Unity

Conflicts:
	Assets/NPC/NPC_Movement_2.cs