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

Conflicts:
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	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/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Trigonometric Anomaly/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Trigonometric Anomaly/Library/assetDatabase3
	Trigonometric Anomaly/Library/guidmapper
	Trigonometric Anomaly/Library/metadata/03/039c349650630fb448506b7f3a7bf4a2
	Trigonometric Anomaly/Library/metadata/17/1739272cd3376274d9c9afaae5008895
	Trigonometric Anomaly/Library/metadata/53/53cb02800637c3841bf1fe680c44b6e5
	Trigonometric Anomaly/Library/metadata/7d/7d9d7b50d6d7aa54491a9eadfb40ad2c
	Trigonometric Anomaly/Library/metadata/c4/c4cf148316284fb489e3287a849154ca
	Trigonometric Anomaly/Library/metadata/c6/c6ff9b3115ee3ee479f352db69c2a6f3
	Trigonometric Anomaly/Library/metadata/dd/dd931254cc7e216418c00808f496bf1e
	Trigonometric Anomaly/Library/metadata/e4/e44571cd2e739c04c969d63ff0389975
	Trigonometric Anomaly/Library/metadata/eb/eba4c918294189c43b82c00d98b7b1fe
	Trigonometric Anomaly/Library/metadata/ee/eec79f028875ed84a84b55262ce6c5b8
	Trigonometric Anomaly/Library/metadata/f3/f34722b1f1a589e4bba92a70a62902f5
	Trigonometric Anomaly/Trigonometric Anomaly-csharp.sln
	Trigonometric Anomaly/Trigonometric Anomaly.sln
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs