merge
Merge branch 'master' of https://github.com/Caster123/CS3247Project

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity Project/Library/assetDatabase3
	Unity Project/Library/expandedItems
	Unity Project/Library/guidmapper
	Unity Project/Library/metadata/00/006a5f739d1105f6a000538a2aef8c59
	Unity Project/Library/metadata/05/054be44bec922ad4dbea626a45edb961
	Unity Project/Library/metadata/06/06893cec523208643a91b7a393737700
	Unity Project/Library/metadata/07/073946e94d57ac04fb345d5c28d21992
	Unity Project/Library/metadata/0c/0c2d8569031f5454cbbac2c772e2767d
	Unity Project/Library/metadata/10/103612e5e1ff43a4e896c567a2cb3ae1
	Unity Project/Library/metadata/16/16522f49031ff414abdf1f83f1b6a36c
	Unity Project/Library/metadata/17/17da6d53ec93a0444bd0f751b1d02477
	Unity Project/Library/metadata/19/1936953540671453daa32bee58124b0c
	Unity Project/Library/metadata/19/199ba61b407d7435aa1a5551f0844272
	Unity Project/Library/metadata/21/215977489d11178d11005b9844295342
	Unity Project/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Unity Project/Library/metadata/26/26d8bdbc8646bde48b05fbaacaaa6577
	Unity Project/Library/metadata/26/26ebd1f47951f4434892c20bcd5e3861
	Unity Project/Library/metadata/28/283746c560beb6145a5409c8e486d6d9
	Unity Project/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	Unity Project/Library/metadata/30/30abebfd9bf1c49d8a2d26e61e66bc15
	Unity Project/Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Unity Project/Library/metadata/39/3939554270ba34e3c84bf1bc113cf5b7
	Unity Project/Library/metadata/3b/3b63729d15bcc874297c6b908416afd9
	Unity Project/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Unity Project/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc
	Unity Project/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	Unity Project/Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	Unity Project/Library/metadata/53/5317f3e76581f4165b16ede5caa5f14b
	Unity Project/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Unity Project/Library/metadata/56/56b5ef6a5c3d597449f679d2a30528e2
	Unity Project/Library/metadata/5b/5ba172cd3918d7c44aa6d04446119a00
	Unity Project/Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	Unity Project/Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	Unity Project/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	Unity Project/Library/metadata/64/642367443312c224bb40c297365867ac
	Unity Project/Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	Unity Project/Library/metadata/6b/6b436d069d11415d1100ab9b44295342
	Unity Project/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	Unity Project/Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	Unity Project/Library/metadata/77/779f088d06e1dd34cb94e47165cac838
	Unity Project/Library/metadata/78/78e12d71d5af24a4c960d6f683ccee13
	Unity Project/Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	Unity Project/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	Unity Project/Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	Unity Project/Library/metadata/84/84b9e1d19d11078d11005b9844295342
	Unity Project/Library/metadata/87/879566529466b4acb9d9b47176abe812
	Unity Project/Library/metadata/8d/8d25458fdca034e36a127e4b135a0206
	Unity Project/Library/metadata/8d/8d2d948c5443d4b68a74883e055e219b
	Unity Project/Library/metadata/93/93074eff559734934be9005d139a9ad5
	Unity Project/Library/metadata/93/931987be26c9646429c56f8a4692bb81
	Unity Project/Library/metadata/94/9485b0c79d11e2e4d0007da98d76c639
	Unity Project/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	Unity Project/Library/metadata/96/96571475093fb4359b11d284aff148d9
	Unity Project/Library/metadata/98/985e70e58a6b14e4ca5ab5b10519069b
	Unity Project/Library/metadata/98/98c330f39d11745ad0004adb8d76c639
	Unity Project/Library/metadata/9b/9ba05f538ee36044da5cd2a4f14a8b18
	Unity Project/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Unity Project/Library/metadata/a0/a069effe31719324fa0736f019aa6716
	Unity Project/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
	Unity Project/Library/metadata/a3/a3384ef3e2313034f9016ad8a1f3999f
	Unity Project/Library/metadata/a6/a6dbb96b9d112024d000e929e39e7c39
	Unity Project/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	Unity Project/Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	Unity Project/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	Unity Project/Library/metadata/bc/bcf1704da4dcf4ca7be0acf40020b0c4
	Unity Project/Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	Unity Project/Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	Unity Project/Library/metadata/c9/c9e6294c9d11cb8d11006bf944295342
	Unity Project/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Unity Project/Library/metadata/cc/cc90a732ad112a541100162a44295342
	Unity Project/Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
	Unity Project/Library/metadata/da/dab0806454e4d924491b1b84dddaa6b7
	Unity Project/Library/metadata/e0/e08c295755c0885479ad19f518286ff2
	Unity Project/Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	Unity Project/Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	Unity Project/Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08
	Unity Project/Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	Unity Project/Library/metadata/ef/efa98d27390e79d4db284aeb5e60d4b9
	Unity Project/Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	Unity Project/Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	Unity Project/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09