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

Conflicts:
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs
asteroid spawner
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly

Conflicts:
	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/guidmapper
	Trigonometric Anomaly/Library/metadata/eb/eba4c918294189c43b82c00d98b7b1fe
	Trigonometric Anomaly/Library/metadata/ff/ffd59023c77e3ee4fa9ccf6c557782f5
	Trigonometric Anomaly/Trigonometric Anomaly-csharp.sln
	Trigonometric Anomaly/Trigonometric Anomaly.sln
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs
music fixed, change to FollowPlayer.cs