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

Conflicts:
	Trigonometric Anomaly/Library/CurrentLayout.dwlt
	Trigonometric Anomaly/Library/InspectorExpandedItems.asset
	Trigonometric Anomaly/Library/assetDatabase3
	Trigonometric Anomaly/Library/guidmapper
	Trigonometric Anomaly/Library/metadata/2e/2e6392903bbe21b4c9b2e198ef7254fa
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs
dfghdh
Merge branch 'master' of https://github.com/comp476-team3/trigonometric-anomaly

Conflicts:
	Trigonometric Anomaly/Assembly-CSharp-firstpass-vs.csproj
	Trigonometric Anomaly/Assembly-CSharp-firstpass.csproj
	Trigonometric Anomaly/Assembly-CSharp-vs.csproj
	Trigonometric Anomaly/Assembly-CSharp.csproj
	Trigonometric Anomaly/Assembly-UnityScript-Editor-vs.unityproj
	Trigonometric Anomaly/Assembly-UnityScript-Editor.unityproj
	Trigonometric Anomaly/Assembly-UnityScript-firstpass-vs.unityproj
	Trigonometric Anomaly/Assembly-UnityScript-firstpass.unityproj
	Trigonometric Anomaly/Library/AssetServerCacheV3
	Trigonometric Anomaly/Library/CurrentLayout.dwlt
	Trigonometric Anomaly/Library/CurrentMaximizeLayout.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/expandedItems
	Trigonometric Anomaly/Library/guidmapper
	Trigonometric Anomaly/Library/metadata/00/003377fc2620a44939dadde6fe3f8190
	Trigonometric Anomaly/Library/metadata/01/017ca72b9e8a749058d13ebd527e98fa
	Trigonometric Anomaly/Library/metadata/03/039c349650630fb448506b7f3a7bf4a2
	Trigonometric Anomaly/Library/metadata/04/043c02dc3f6dd0f4db52c46c132478e0
	Trigonometric Anomaly/Library/metadata/04/044d510fc11b7a4448edc0c7cc1ff3b4
	Trigonometric Anomaly/Library/metadata/04/04777896b3565514c89ff279f6ff35a7
	Trigonometric Anomaly/Library/metadata/04/04dbc0581071c254ea6564b2ff06ff9b
	Trigonometric Anomaly/Library/metadata/07/07908596adeccf341874f3efcfe0bc74
	Trigonometric Anomaly/Library/metadata/07/07e7320249c914340a4f0ae736ea24ed
	Trigonometric Anomaly/Library/metadata/0a/0a8e0413e0444491eaddd12550af679e
	Trigonometric Anomaly/Library/metadata/0a/0aeaa4cb29f5d4e9c8455f04c8575c8c
	Trigonometric Anomaly/Library/metadata/0d/0d1352984e3c6465088f6cc7c4ce6e22
	Trigonometric Anomaly/Library/metadata/0d/0d1644bdf064147baa97f235fc5b4903
	Trigonometric Anomaly/Library/metadata/0d/0da8daaf1d21e474bafa968f8f6c9f1e
	Trigonometric Anomaly/Library/metadata/0e/0e447868506ba49f0a73235b8a8b647a
	Trigonometric Anomaly/Library/metadata/13/13f868bfc53895c4ca16ffddb386ae27
	Trigonometric Anomaly/Library/metadata/14/14768d3865b1342e3a861fbe19ba2db2
	Trigonometric Anomaly/Library/metadata/17/178e954e5548fe5419ef0614d731c36e
	Trigonometric Anomaly/Library/metadata/17/17e98f0b96d73d444981dd98fb4c6a4e
	Trigonometric Anomaly/Library/metadata/18/186c4c0d31e314f049595dcbaf4ca129
	Trigonometric Anomaly/Library/metadata/1c/1cfe02ffd0b74854ea5bcd1a3c63ac3c
	Trigonometric Anomaly/Library/metadata/1d/1d46a17a95a444c08830612bc1146d1d
	Trigonometric Anomaly/Library/metadata/1d/1dad87ba4f1e04d6eb7f287e1f2e08fe
	Trigonometric Anomaly/Library/metadata/1f/1f7c36949654dcb4790785858e78a7cf
	Trigonometric Anomaly/Library/metadata/23/237a7a10492cc4ae6a3adcc6419f4961
	Trigonometric Anomaly/Library/metadata/24/243a781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/25/257bc83cbeb544540bd0e558aa9b1383
	Trigonometric Anomaly/Library/metadata/27/273404942eede4ea1883ca1fb2942507
	Trigonometric Anomaly/Library/metadata/2b/2b4f29398d9484ccfa9fd220449f5eee
	Trigonometric Anomaly/Library/metadata/2b/2b5d018c20c505c48b8de1a8496889e8
	Trigonometric Anomaly/Library/metadata/2d/2d7914440ac9e4b22a60e4303888e90c
	Trigonometric Anomaly/Library/metadata/2e/2e6392903bbe21b4c9b2e198ef7254fa
	Trigonometric Anomaly/Library/metadata/2f/2fad8b95687895f429d4723a9852b422
	Trigonometric Anomaly/Library/metadata/31/31f5a8611c4ed1245b18456206e798dc
	Trigonometric Anomaly/Library/metadata/34/34382083ad114a07d000fbfb8d76c639
	Trigonometric Anomaly/Library/metadata/34/34c3946ab5378473cb34bedd1c8194ba
	Trigonometric Anomaly/Library/metadata/36/36f48f2018eba4c07a9ed16f79126f55
	Trigonometric Anomaly/Library/metadata/3d/3d78256471dee4d869e7f18f13f73945
	Trigonometric Anomaly/Library/metadata/3e/3e177568faf634377937607864643e25
	Trigonometric Anomaly/Library/metadata/3e/3e504a46a8fcec34db3c4776530c6eb2
	Trigonometric Anomaly/Library/metadata/3e/3e9993d57f7d3764eb29b6b93d6a11d5
	Trigonometric Anomaly/Library/metadata/43/438ddd58d82c84d9eb1fdc56111702e1
	Trigonometric Anomaly/Library/metadata/43/43c4a22702d655645a28f16d629e9eaf
	Trigonometric Anomaly/Library/metadata/43/43ca18288c424f645aaa1e9e07f04c50
	Trigonometric Anomaly/Library/metadata/43/43d955acba56d47d3be0eb7eef88325c
	Trigonometric Anomaly/Library/metadata/45/459fe69d2f6d74ddb92f04dbf45a866b
	Trigonometric Anomaly/Library/metadata/47/478a2083ad114a07d000fbfb8d76c639
	Trigonometric Anomaly/Library/metadata/49/49b4d4c810eb44642b415cf62b24efe3
	Trigonometric Anomaly/Library/metadata/51/51ae11a5cd82fda468a85179946d672a
	Trigonometric Anomaly/Library/metadata/52/52641a36df9ae43a18965d3cac5fcb31
	Trigonometric Anomaly/Library/metadata/53/53b3960ee3d3d4a5caa8d5473d120187
	Trigonometric Anomaly/Library/metadata/53/53cb02800637c3841bf1fe680c44b6e5
	Trigonometric Anomaly/Library/metadata/56/562f620336e024ac99992ff05725a89a
	Trigonometric Anomaly/Library/metadata/57/57378565f2adf4d3fbe949ebe1453f09
	Trigonometric Anomaly/Library/metadata/57/57b33a14b6d5347c5a85c36f6cb3b280
	Trigonometric Anomaly/Library/metadata/57/57cdacf9b217546aaa18edf39a6151c0
	Trigonometric Anomaly/Library/metadata/57/57e6deea7c2924e22a5138e2b70bb4dc
	Trigonometric Anomaly/Library/metadata/5a/5a8c1b59f27344754b41795198b8f341
	Trigonometric Anomaly/Library/metadata/5d/5d7f4c401ae8946bcb0d6ff68a9e7466
	Trigonometric Anomaly/Library/metadata/5d/5daf5c0b38380c34cac59820f738dc5f
	Trigonometric Anomaly/Library/metadata/62/6205c27cc031f4e66b8ea90d1bfaa158
	Trigonometric Anomaly/Library/metadata/62/627943dc7a9a74286b70a4f694a0acd5
	Trigonometric Anomaly/Library/metadata/62/62bcade1028c24ca1a39760ed84b9487
	Trigonometric Anomaly/Library/metadata/64/641b781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/67/67f8781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/68/68a00c837b82e4c6d92e7da765dc5f1d
	Trigonometric Anomaly/Library/metadata/69/695fec12044c1d14998fbb61b19368f7
	Trigonometric Anomaly/Library/metadata/6d/6d55b5e91b95c41739cdf4f804dd383d
	Trigonometric Anomaly/Library/metadata/6f/6f1418cffd12146f2a83be795f6fa5a7
	Trigonometric Anomaly/Library/metadata/6f/6f509e77aa2587b468f66eb5481d9749
	Trigonometric Anomaly/Library/metadata/6f/6faf3d14a3a57f44282ba53aba4036f6
	Trigonometric Anomaly/Library/metadata/70/708b781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/70/70d8568987ac0499f952b54c7c13e265
	Trigonometric Anomaly/Library/metadata/73/734843ff11f0d6440a21728e0c32526c
	Trigonometric Anomaly/Library/metadata/75/7582ab3f881264059af1f28fe5b7e44b
	Trigonometric Anomaly/Library/metadata/76/7699c5fbfa27745a1abe111ab7bf9785
	Trigonometric Anomaly/Library/metadata/77/776cc4b17d3044029b83a0c3fc4c2965
	Trigonometric Anomaly/Library/metadata/78/7856cbff0a0ca45c787d5431eb805bb0
	Trigonometric Anomaly/Library/metadata/7a/7a632f967e8ad42f5bd275898151ab6a
	Trigonometric Anomaly/Library/metadata/7c/7c7cc94b4f3c61f4480e7ee3702d6250
	Trigonometric Anomaly/Library/metadata/7d/7d0246b3cc5223444b6e685ac5f63ab9
	Trigonometric Anomaly/Library/metadata/7d/7d5488e098d8f4eb492591bb089fe793
	Trigonometric Anomaly/Library/metadata/7d/7d8a5dc9cc5ffdd4f9b04d0150f11747
	Trigonometric Anomaly/Library/metadata/7d/7d9d7b50d6d7aa54491a9eadfb40ad2c
	Trigonometric Anomaly/Library/metadata/83/830124219c78b2e478e70f830467ccd4
	Trigonometric Anomaly/Library/metadata/83/83b39678ff6aa4fec8d135d231ba9cde
	Trigonometric Anomaly/Library/metadata/85/85a88efa8c871af4a9d17c64791b6f4f
	Trigonometric Anomaly/Library/metadata/87/874ceab4425f64bccb1d14032f4452b1
	Trigonometric Anomaly/Library/metadata/89/89a037199d11087f1100e2b844295342
	Trigonometric Anomaly/Library/metadata/8b/8b30686bb4322ab42ad5eb50a0210b58
	Trigonometric Anomaly/Library/metadata/8c/8c81db0e527d24acc9bcec04e87781bd
	Trigonometric Anomaly/Library/metadata/8e/8edd86d270edb1a47955aa151efab0fe
	Trigonometric Anomaly/Library/metadata/93/933f18824b218304ba518cf09aee5e02
	Trigonometric Anomaly/Library/metadata/95/953d0b75f2bae4d488917cdf8e4b8040
	Trigonometric Anomaly/Library/metadata/95/95616c020c5604dda96cf76afbbc0272
	Trigonometric Anomaly/Library/metadata/95/95ef4804fe0be4c999ddaa383536cde8
	Trigonometric Anomaly/Library/metadata/96/9632fe331f54a4b7eb377365cc94b406
	Trigonometric Anomaly/Library/metadata/96/96ca71e39c7b6fb4f9bec2c5bf331349
	Trigonometric Anomaly/Library/metadata/97/97b4768c3683045e4bfdb2e78272970c
	Trigonometric Anomaly/Library/metadata/98/987fb0677d01f43ce8a9dbf12271e668
	Trigonometric Anomaly/Library/metadata/9a/9ad381ed8492840ab9f165df743e4826
	Trigonometric Anomaly/Library/metadata/a0/a07a781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/a1/a181ca8e3c62f3e4b8f183f6c586b032
	Trigonometric Anomaly/Library/metadata/a4/a40c1b84cf7fe418bae97a29041b85a4
	Trigonometric Anomaly/Library/metadata/a4/a4b474cd484494a4aaa4bbf928219d09
	Trigonometric Anomaly/Library/metadata/a4/a4cdca73d61814d33ac1587f6c163bca
	Trigonometric Anomaly/Library/metadata/a7/a773099f140e846f7835d27351846623
	Trigonometric Anomaly/Library/metadata/a7/a78df3733e72bcb47ba5f33c7cec9241
	Trigonometric Anomaly/Library/metadata/a8/a88a26a276b4e47619ce2c5adad33fab
	Trigonometric Anomaly/Library/metadata/a9/a94b781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/a9/a9aaa3f5f2d574f228e4a21aa38b61e4
	Trigonometric Anomaly/Library/metadata/a9/a9df009a214e24a5ebbf271595f8d5b6
	Trigonometric Anomaly/Library/metadata/aa/aadb07259ccf0d244ae6771351a0ac80
	Trigonometric Anomaly/Library/metadata/ab/ab5daa751337aab459fe692bce8c236f
	Trigonometric Anomaly/Library/metadata/ac/acd613035ff3e455e8abf23fdc8c8c24
	Trigonometric Anomaly/Library/metadata/b0/b0249d8c935344451aa4de6db76f0688
	Trigonometric Anomaly/Library/metadata/b0/b0923359e9e352a4b9b11c7b7161ad67
	Trigonometric Anomaly/Library/metadata/b1/b14b79b8936134d3f8238f0c2d40d634
	Trigonometric Anomaly/Library/metadata/b2/b2145489f7c704db8acb14a52bddeee9
	Trigonometric Anomaly/Library/metadata/b2/b26ea71d98f9cef41b17f1b3a25dcc21
	Trigonometric Anomaly/Library/metadata/b2/b2ce9882c3cafa24c8e1fb06b35716f9
	Trigonometric Anomaly/Library/metadata/b3/b3728d1488b02490cbd196c7941bf1f8
	Trigonometric Anomaly/Library/metadata/b5/b59984d82af624bd3b0c777f038276f2
	Trigonometric Anomaly/Library/metadata/b6/b61f0d8d8244b4b28aa66b0c8cb46a8d
	Trigonometric Anomaly/Library/metadata/b6/b6aa781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/b9/b912f6e1624db1b4bad06bac02652fc0
	Trigonometric Anomaly/Library/metadata/bb/bb4af680337344a4abad65a4e8873c50
	Trigonometric Anomaly/Library/metadata/bc/bc0ba45afbd7c2641a73800668b328f4
	Trigonometric Anomaly/Library/metadata/bd/bdda781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/be/be6e39cf196f146d5be72fbefb18ed75
	Trigonometric Anomaly/Library/metadata/be/bef3d242a13c447ac90c2d2dc213b1ea
	Trigonometric Anomaly/Library/metadata/be/befbb4b9c320b4b18a08ef7afb93b6c9
	Trigonometric Anomaly/Library/metadata/bf/bf34d2a25450349699e8ae6456fa7ca9
	Trigonometric Anomaly/Library/metadata/c1/c1409ce56b1c8422e849019fc420df42
	Trigonometric Anomaly/Library/metadata/c1/c182fa94a5a0a4c02870641efcd38cd5
	Trigonometric Anomaly/Library/metadata/c4/c4cf148316284fb489e3287a849154ca
	Trigonometric Anomaly/Library/metadata/c5/c547503fff0e8482ea5793727057041c
	Trigonometric Anomaly/Library/metadata/c6/c60d549d7b8ffdd479e6bedd2605e659
	Trigonometric Anomaly/Library/metadata/c6/c6ff9b3115ee3ee479f352db69c2a6f3
	Trigonometric Anomaly/Library/metadata/cd/cd5b323dcc592457790ff18b528f5e67
	Trigonometric Anomaly/Library/metadata/ce/ce0cb2621f6d84e21a87414e471a3cce
	Trigonometric Anomaly/Library/metadata/cf/cf6d8fc1580864a149a13b0e37bb6659
	Trigonometric Anomaly/Library/metadata/d0/d0c04f2985d492241996afcd9a96d576
	Trigonometric Anomaly/Library/metadata/d3/d35a90bed98554f4d8b92c9cd3cfbafa
	Trigonometric Anomaly/Library/metadata/d3/d3b1c8c1036784176946f5cfbfb7fe4c
	Trigonometric Anomaly/Library/metadata/d4/d40f729f662bdc54a96cd33514989eea
	Trigonometric Anomaly/Library/metadata/d4/d440902fad11e807d00044888d76c639
	Trigonometric Anomaly/Library/metadata/d6/d6ef58fc6f637406bbe6814a19c377f8
	Trigonometric Anomaly/Library/metadata/d7/d7e50645ce0091b428e635ba366e8e2d
	Trigonometric Anomaly/Library/metadata/d8/d8de564736aeb814097f576e74cc0d3c
	Trigonometric Anomaly/Library/metadata/d8/d8e82664aa8686642a424c88ab10164a
	Trigonometric Anomaly/Library/metadata/d9/d9cccf980fcb7441d85b8b3b5c2d2c34
	Trigonometric Anomaly/Library/metadata/d9/d9e12470535464538a29207930915629
	Trigonometric Anomaly/Library/metadata/da/da310021e2a4142429d95c537846dc38
	Trigonometric Anomaly/Library/metadata/da/daf9781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/dd/dd05e71c69dd4457fa205c9eea7c2326
	Trigonometric Anomaly/Library/metadata/dd/dd931254cc7e216418c00808f496bf1e
	Trigonometric Anomaly/Library/metadata/e0/e04ef121228444287a4c957e442a58c1
	Trigonometric Anomaly/Library/metadata/e2/e2baf3cae8edc4daf94c9adc2154be00
	Trigonometric Anomaly/Library/metadata/e4/e44571cd2e739c04c969d63ff0389975
	Trigonometric Anomaly/Library/metadata/e5/e515e0f94cefc4c0db54b45cba621544
	Trigonometric Anomaly/Library/metadata/e5/e5c5e2db9410df445ae24e6d1bc074b8
	Trigonometric Anomaly/Library/metadata/e6/e653d08d21ce9453591b1dc2100fdfcd
	Trigonometric Anomaly/Library/metadata/e8/e80c3c84ea861404d8a427db8b7abf04
	Trigonometric Anomaly/Library/metadata/e9/e97c14fbb5ea04c3a902cc533d7fc5d1
	Trigonometric Anomaly/Library/metadata/e9/e9a9781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/e9/e9b41ef81e8d74f3a814d061ec18b3a7
	Trigonometric Anomaly/Library/metadata/e9/e9ba2083ad114a07d000fbfb8d76c639
	Trigonometric Anomaly/Library/metadata/ea/ea59781cad112c75d0008dfa8d76c639
	Trigonometric Anomaly/Library/metadata/eb/eba4c918294189c43b82c00d98b7b1fe
	Trigonometric Anomaly/Library/metadata/ec/ec92b071d2d424aecb3e46f28eb63174
	Trigonometric Anomaly/Library/metadata/ec/ecd9a2c463dcb476891e43d7c9f16ffa
	Trigonometric Anomaly/Library/metadata/ed/edb8dea92f0664f7ebdba06b4f2697da
	Trigonometric Anomaly/Library/metadata/ee/eec79f028875ed84a84b55262ce6c5b8
	Trigonometric Anomaly/Library/metadata/f1/f1b13d7a80660504a858ea24cfa418c6
	Trigonometric Anomaly/Library/metadata/f2/f202adaee27c646fa9d90739bb84aa42
	Trigonometric Anomaly/Library/metadata/f2/f2648273e111b48e881504326f709df7
	Trigonometric Anomaly/Library/metadata/f3/f34722b1f1a589e4bba92a70a62902f5
	Trigonometric Anomaly/Library/metadata/f4/f4901f25d4e1542589348bbb89563d8e
	Trigonometric Anomaly/Library/metadata/f5/f58445347fe2e4b8396487ed2bfa02ad
	Trigonometric Anomaly/Library/metadata/f6/f616f18c4a451fa49aee89160f45df35
	Trigonometric Anomaly/Library/metadata/f6/f6469eb0ad1119d6d00011d98d76c639
	Trigonometric Anomaly/Library/metadata/f6/f688f89ed5eb847c5b19c934a0f1e772
	Trigonometric Anomaly/Library/metadata/f6/f6b3d005d2f3a4a43a7bbbf44471aef9
	Trigonometric Anomaly/Library/metadata/f7/f7898d203e9b94c0dbe2bf9dd5cb32c0
	Trigonometric Anomaly/Library/metadata/f7/f7db9ec1392f34265817a55853e6ab07
	Trigonometric Anomaly/Library/metadata/f9/f9372f23586ef470b97d53856af88487
	Trigonometric Anomaly/Library/metadata/f9/f9d5fa183cd6b45eeb1491f74863cd91
	Trigonometric Anomaly/Library/metadata/fa/fa3c09c9b1eff448fa03c3cc1ffd0283
	Trigonometric Anomaly/Library/metadata/fb/fb52973118cf00648825ced2fcca240c
	Trigonometric Anomaly/Library/metadata/fc/fc00ec05a89da4ff695a4273715cd5ce
	Trigonometric Anomaly/Library/metadata/ff/ffa9c02760c2b4e8eb9814ec06c4b05b
	Trigonometric Anomaly/Trigonometric Anomaly-csharp.sln
	Trigonometric Anomaly/Trigonometric Anomaly.sln
	Trigonometric Anomaly/Trigonometric Anomaly.userprefs
asteroids fix