new controllers
sad
metadata
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly

Conflicts:
	Trigonometric Anomaly/Assembly-CSharp-vs.csproj
	Trigonometric Anomaly/Assembly-CSharp.csproj
	Trigonometric Anomaly/Library/CurrentLayout.dwlt
	Trigonometric Anomaly/Library/InspectorExpandedItems.asset
	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/07/07908596adeccf341874f3efcfe0bc74
	Trigonometric Anomaly/Library/metadata/13/13f868bfc53895c4ca16ffddb386ae27
	Trigonometric Anomaly/Library/metadata/3d/3de5387b933eac24e81d6df1dc64b583
	Trigonometric Anomaly/Library/metadata/7d/7d0246b3cc5223444b6e685ac5f63ab9
	Trigonometric Anomaly/Library/metadata/7d/7d9d7b50d6d7aa54491a9eadfb40ad2c
	Trigonometric Anomaly/Library/metadata/83/830124219c78b2e478e70f830467ccd4
	Trigonometric Anomaly/Library/metadata/95/953d0b75f2bae4d488917cdf8e4b8040
	Trigonometric Anomaly/Library/metadata/aa/aadb07259ccf0d244ae6771351a0ac80
	Trigonometric Anomaly/Library/metadata/b1/b1f4aac2c6667456c80bc8ab9bac6ed1
	Trigonometric Anomaly/Library/metadata/b2/b2ce9882c3cafa24c8e1fb06b35716f9
	Trigonometric Anomaly/Library/metadata/c6/c6ff9b3115ee3ee479f352db69c2a6f3
	Trigonometric Anomaly/Library/metadata/e2/e2cf1b9429666684db2413e2f709117c
	Trigonometric Anomaly/Library/metadata/ee/eec79f028875ed84a84b55262ce6c5b8
	Trigonometric Anomaly/Library/metadata/f3/f34722b1f1a589e4bba92a70a62902f5
	Trigonometric Anomaly/Library/metadata/f6/f6b3d005d2f3a4a43a7bbbf44471aef9
	Trigonometric Anomaly/Trigonometric Anomaly-csharp.sln
	Trigonometric Anomaly/Trigonometric Anomaly.sln
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs