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

Conflicts:
	Trigonometric Anomaly/Assets/Scenes/main.unity
	Trigonometric Anomaly/Library/InspectorExpandedItems.asset
	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/7d/7d0246b3cc5223444b6e685ac5f63ab9
	Trigonometric Anomaly/Library/metadata/c4/c4cf148316284fb489e3287a849154ca
	Trigonometric Anomaly/Library/metadata/dd/dd931254cc7e216418c00808f496bf1e
	Trigonometric Anomaly/Library/metadata/eb/eba4c918294189c43b82c00d98b7b1fe
sdasd