Edited npc stuff
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly

Conflicts:
	Trigonometric Anomaly/Library/CurrentLayout.dwlt
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp.dll
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Trigonometric
Anomaly/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Trigonometric
Anomaly/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Trigonometric Anomaly/Library/assetDatabase3
	Trigonometric
Anomaly/Library/metadata/1f/1f7c36949654dcb4790785858e78a7cf
	Trigonometric
Anomaly/Library/metadata/dd/dd931254cc7e216418c00808f496bf1e
	Trigonometric
Anomaly/Library/metadata/eb/eba4c918294189c43b82c00d98b7b1fe
	Trigonometric Anomaly/Trigonometric Anomaly-csharp.sln
	Trigonometric Anomaly/Trigonometric Anomaly.sln