Shaobo fixed the emp
Merge branch 'master' of https://github.com/JordanLingHua/cs113Project

Conflicts:
	cs113Project/Assets/CutSceneTrigger.cs
	cs113Project/Assets/Enemies/Enemy.cs