Healthbar&GUI
niks.
gui

kleine aanpassing texture
Merge branch 'master' of https://github.com/Team-201-c/Master

j
player/rock collision
iets
test

/
Merge branch 'mahsa'

Conflicts:
	mainproject/Assembly-CSharp-Editor-vs.csproj
	mainproject/Assembly-CSharp-Editor.csproj
	mainproject/Assembly-CSharp-vs.csproj
	mainproject/Assembly-CSharp.csproj
	mainproject/Assembly-UnityScript-vs.unityproj
	mainproject/Assembly-UnityScript.unityproj
	mainproject/Assets/Prefabs/Mission1/rock1prefab.prefab
	mainproject/Assets/Prefabs/Mission1/rock2prefab.prefab
	mainproject/Assets/Scenes/mission 1.unity
	mainproject/Assets/Scripts/Mission 1/CameraShake.cs
	mainproject/Assets/Scripts/veel gebruikte scripts/Switch.cs
	mainproject/Library/AssetServerCacheV3
	mainproject/Library/CurrentLayout.dwlt
	mainproject/Library/CurrentMaximizeLayout.dwlt
	mainproject/Library/InspectorExpandedItems.asset
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	mainproject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	mainproject/Library/assetDatabase3
	mainproject/Library/expandedItems
	mainproject/Library/guidmapper
	mainproject/Library/metadata/01/01316b23be3314f809e077d1a09f6b04
	mainproject/Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	mainproject/Library/metadata/01/01d5fad5df8c04a0ea2e3dbee721a764
	mainproject/Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	mainproject/Library/metadata/04/047330f39d11745ad0004adb8d76c639
	mainproject/Library/metadata/04/04734208c852847cb81cb99f8ff46658
	mainproject/Library/metadata/04/04fbad0c961d2451da9c9ff6ee0cec10
	mainproject/Library/metadata/05/054be44bec922ad4dbea626a45edb961
	mainproject/Library/metadata/05/0568ecdd797316641b0203860b3929d9
	mainproject/Library/metadata/05/05eab95d91a0143cbb7c813fb8f2c89e
	mainproject/Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
	mainproject/Library/metadata/06/06a50e4d86be7427bb1fd9b9b63d0d8f
	mainproject/Library/metadata/07/073946e94d57ac04fb345d5c28d21992
	mainproject/Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	mainproject/Library/metadata/09/0904e339eb6fdd546b8539bd04db10ed
	mainproject/Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	mainproject/Library/metadata/0b/0b7e04496e1704097823924870e74e6d
	mainproject/Library/metadata/0e/0ec2cbfa254a646bb99e7b2afce39de1
	mainproject/Library/metadata/0f/0fda570c198498846a2984244a051c1b
	mainproject/Library/metadata/11/11674ddfd76444688a71e5de789903d7
	mainproject/Library/metadata/11/116dbe87a918349ca9afbc969a75ca67
	mainproject/Library/metadata/14/1454da46ff6d14423a3e7ecb96bf9028
	mainproject/Library/metadata/16/16522f49031ff414abdf1f83f1b6a36c
	mainproject/Library/metadata/16/16dd8248d31591f4fbea40ca5d506411
	mainproject/Library/metadata/18/18214e9d6af6248559d501391856f1c7
	mainproject/Library/metadata/19/1936953540671453daa32bee58124b0c
	mainproject/Library/metadata/19/195c271a9118d224c8562ae67cf47a66
	mainproject/Library/metadata/1c/1caebddcbb4c94a5885ba9a5eaaafd5e
	mainproject/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	mainproject/Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
	mainproject/Library/metadata/24/24be8e1643b8a474fbb57fcda8a1c454
	mainproject/Library/metadata/28/28237ea4b44d34c9187528c362904689
	mainproject/Library/metadata/28/283746c560beb6145a5409c8e486d6d9
	mainproject/Library/metadata/28/287b313443d7f3d4cbe2e8c8ae7e6078
	mainproject/Library/metadata/29/2904a5ee556aa4e9ea803acef54394bd
	mainproject/Library/metadata/29/2936bba4fc3484b0dab16aa3a2c4f601
	mainproject/Library/metadata/29/29a982d39f58c644bb19d88f1d67565a
	mainproject/Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	mainproject/Library/metadata/2a/2ae50551232db43eabe801fa34dc0c42
	mainproject/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	mainproject/Library/metadata/2b/2b25f6df311250640ba2394daf351deb
	mainproject/Library/metadata/2c/2c528fec5d95e4ac28cf46399b887662
	mainproject/Library/metadata/2c/2c93b54a9ce1c314b809b4c11cf9cdb6
	mainproject/Library/metadata/2d/2d0c0d050be904ca4abf8890f2c4abe3
	mainproject/Library/metadata/2e/2e63748b1771f4d9f85197f8244d4bbd
	mainproject/Library/metadata/30/30abebfd9bf1c49d8a2d26e61e66bc15
	mainproject/Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	mainproject/Library/metadata/32/32ef381921b3f7f479831b042c113762
	mainproject/Library/metadata/37/3714360bfa2716145b2f225acd8c1546
	mainproject/Library/metadata/37/37f92a03ef93dc044a04c19c8081c1ea
	mainproject/Library/metadata/39/397c32fb057504c4bbc172edd30f50e3
	mainproject/Library/metadata/3a/3a67505ded26145ecbbafc32f569f643
	mainproject/Library/metadata/3a/3ad59c86f31800c469ea57833930cbd9
	mainproject/Library/metadata/3e/3ef8684d8b49f4d189bd2824374f328a
	mainproject/Library/metadata/40/407bb174b313cf345b017fa281244b2a
	mainproject/Library/metadata/41/414cfcad66dcc3343a783c3f2b03a8c1
	mainproject/Library/metadata/42/4241a61e09bf94eef9ea8d9c33ccaf72
	mainproject/Library/metadata/42/42b0d1dc1292f462e9262bf8019d9b1c
	mainproject/Library/metadata/44/440eb36db91ca410f800ff3cfe43572f
	mainproject/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	mainproject/Library/metadata/4a/4aafecbcd2e60264db684efd5fce5ede
	mainproject/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc
	mainproject/Library/metadata/4d/4d60045d2a1244a44bbc563a75ee5947
	mainproject/Library/metadata/4e/4e1e2877f8a38b4419ac7deb911c2e76
	mainproject/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	mainproject/Library/metadata/50/5048b8ba3627749ca97fb49b9bda9f00
	mainproject/Library/metadata/51/517a230447c0af548a7679cdf69c3e56
	mainproject/Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	mainproject/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	mainproject/Library/metadata/53/53412155bc1016547b1a77b2333c0380
	mainproject/Library/metadata/54/54605554559384c568209ee5ac675699
	mainproject/Library/metadata/54/54e03e659ab274dd9b12c0538a9c4983
	mainproject/Library/metadata/56/568e8233e6ec8d74bbd74e3c84b5dd0c
	mainproject/Library/metadata/56/56b5ef6a5c3d597449f679d2a30528e2
	mainproject/Library/metadata/58/5861c55756febc148902667397405ff9
	mainproject/Library/metadata/59/591ae67f4dc79ca4c9309f684166bb10
	mainproject/Library/metadata/59/595bdb4ba08337c4097325cdb370d080
	mainproject/Library/metadata/59/599fe31e5918c4e0380381f4cc80d168
	mainproject/Library/metadata/5a/5aab239cac7fe8a4c931693a7535da5c
	mainproject/Library/metadata/5b/5ba172cd3918d7c44aa6d04446119a00
	mainproject/Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	mainproject/Library/metadata/5c/5c947f3bb9fc36449ac8fc9c72cd0f09
	mainproject/Library/metadata/5f/5f75ef29233ec634facc1ba1e1f64725
	mainproject/Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	mainproject/Library/metadata/61/619143473320b4379935fa2815adb224
	mainproject/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	mainproject/Library/metadata/63/63f0303307b245b429f32ebe81429f1e
	mainproject/Library/metadata/64/642367443312c224bb40c297365867ac
	mainproject/Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	mainproject/Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	mainproject/Library/metadata/66/661663e7fa00ae64fa29cf54677bbef4
	mainproject/Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
	mainproject/Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	mainproject/Library/metadata/67/67de91b5513a4d8489588fb65de75caa
	mainproject/Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
	mainproject/Library/metadata/69/69bbf53eea62b4163842473235ed92a2
	mainproject/Library/metadata/6b/6b436d069d11415d1100ab9b44295342
	mainproject/Library/metadata/6d/6d7a73c7b77454be7af0125d082fa5f9
	mainproject/Library/metadata/6d/6dda5f499bc82c442aab32e4a6bdbe40
	mainproject/Library/metadata/6e/6e5fa0ecebf177e43a8d23e65cc6295a
	mainproject/Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	mainproject/Library/metadata/6e/6eef515e7c40d3244ad62dcdf6e8096a
	mainproject/Library/metadata/6f/6f65dd71c2b204564b7c433d6a1426fa
	mainproject/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	mainproject/Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	mainproject/Library/metadata/77/779f088d06e1dd34cb94e47165cac838
	mainproject/Library/metadata/78/78e12d71d5af24a4c960d6f683ccee13
	mainproject/Library/metadata/79/799fe92af22f24ff9b3baa973f37f144
	mainproject/Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
	mainproject/Library/metadata/7b/7b5f2f9ea19c74c659ab8ac969280fb2
	mainproject/Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	mainproject/Library/metadata/7c/7ced1f359c16f41c292e253605b9f1e2
	mainproject/Library/metadata/7d/7d3cfe076f9cbcf4b90e7e11f49fd923
	mainproject/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	mainproject/Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	mainproject/Library/metadata/7e/7e51fafbc9cfaa04697fa62ee999db08
	mainproject/Library/metadata/80/809546e710ded4901baa333bd346ccad
	mainproject/Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	mainproject/Library/metadata/83/83834a84a7f51ea499635300f939721d
	mainproject/Library/metadata/83/838ba4dd42f18234c8039fd1dc09219b
	mainproject/Library/metadata/84/842d39b32695a454d87dce9630b9a235
	mainproject/Library/metadata/84/84376f2a0948947b5a6dfe814a1100a0
	mainproject/Library/metadata/86/866dbe11eb506c14891cc06381306a2b
	mainproject/Library/metadata/86/86f2a5c7ab68c4c7db89c2bde7e26dcc
	mainproject/Library/metadata/87/87e98f563747ec04e8cd93b3fc3b1a29
	mainproject/Library/metadata/88/88bd3864cf0054892a28b21f3464d8f5
	mainproject/Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
	mainproject/Library/metadata/8b/8bb892221a7a9ec4fa5923c5d4154dfe
	mainproject/Library/metadata/8c/8c192604f119843a58ce7bd439efd4f5
	mainproject/Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	mainproject/Library/metadata/90/908a1c8ecd118f12a000e6888f962b59
	mainproject/Library/metadata/91/917ef473cccd84149bb826fdda0e11b9
	mainproject/Library/metadata/91/91c222ac5463b7243849bc078d53e72c
	mainproject/Library/metadata/93/931987be26c9646429c56f8a4692bb81
	mainproject/Library/metadata/93/93bc7d6f0e1793c47a5f88178ecc75fe
	mainproject/Library/metadata/94/9485b0c79d11e2e4d0007da98d76c639
	mainproject/Library/metadata/95/9551d23f5681244a5bf687feb1b45c62
	mainproject/Library/metadata/95/956c1c0113bcd4c4388a3c239be09820
	mainproject/Library/metadata/95/95cc686b88e0d43d1a8235a926c90e65
	mainproject/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	mainproject/Library/metadata/97/9761ea52f3885484fb4c71668d966423
	mainproject/Library/metadata/97/9785a5533d9270849a276a4bfbfa9418
	mainproject/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	mainproject/Library/metadata/98/985e70e58a6b14e4ca5ab5b10519069b
	mainproject/Library/metadata/98/98c330f39d11745ad0004adb8d76c639
	mainproject/Library/metadata/9a/9a332e50dbde644049670b77a0fccd44
	mainproject/Library/metadata/9b/9ba05f538ee36044da5cd2a4f14a8b18
	mainproject/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	mainproject/Library/metadata/9e/9e050e288d2185f45a36abb30c679913
	mainproject/Library/metadata/9e/9ef26a39a400bec44a36b85fd38a2d65
	mainproject/Library/metadata/9f/9fc428eadf2be4fd4bcd7e09ee65c9b6
	mainproject/Library/metadata/a0/a069effe31719324fa0736f019aa6716
	mainproject/Library/metadata/a0/a06e975c1edee4db2bb4db5c585733f1
	mainproject/Library/metadata/a1/a148a280bf01445438591871ff821d1c
	mainproject/Library/metadata/a1/a16e66a740e6b2442957c7367b906904
	mainproject/Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
	mainproject/Library/metadata/a2/a2d308598386f4a0797f87a4b95b9dd1
	mainproject/Library/metadata/a5/a53cf5449d11a15d1100a04b44295342
	mainproject/Library/metadata/a6/a68f088f66c184b84875b37578bae418
	mainproject/Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
	mainproject/Library/metadata/a7/a7c543fd660a2401cb87ff4b94cf6df8
	mainproject/Library/metadata/a8/a867a1028420f4269a5e1913d5a281ed
	mainproject/Library/metadata/a9/a9e9f279297304fe1adeabe0ddfb0f91
	mainproject/Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	mainproject/Library/metadata/ad/ad3355e7635c144a791839f7170de071
	mainproject/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	mainproject/Library/metadata/b0/b056257c0b55a08498bbc9b21e217ccb
	mainproject/Library/metadata/b4/b4a130c897934a54398497235da37fca
	mainproject/Library/metadata/b4/b4dd7bac6c9c9bb4bb3c1b63a3eef362
	mainproject/Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	mainproject/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	mainproject/Library/metadata/bb/bbb6637f8ce50e74a83854c1a41e6cea
	mainproject/Library/metadata/bb/bbba6214b1838a64ebc939ac9a08726d
	mainproject/Library/metadata/bc/bc1c9eff04bec4847bb3dd602f52d400
	mainproject/Library/metadata/be/be7c377d128f1ff46a22853ecdb9e6d1
	mainproject/Library/metadata/bf/bfd675cc0db1d4656b75dc6d6ba91142
	mainproject/Library/metadata/c0/c0bc6ddcbdd31e04d9029ee4002a1637
	mainproject/Library/metadata/c0/c0ccbba9754e6a1488cb1503730ede09
	mainproject/Library/metadata/c2/c25c85fb524f04ea5b7f96dd8eb6cebf
	mainproject/Library/metadata/c2/c2ef94ff9d11915d1100a04b44295342
	mainproject/Library/metadata/c2/c2f277132c6c34f3ba8c57a5b42b85ef
	mainproject/Library/metadata/c3/c3919281c5802454486d7e7ff66b5ef4
	mainproject/Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	mainproject/Library/metadata/c5/c58b1b2c6e5f19644b6d9d6b337c81b6
	mainproject/Library/metadata/c6/c6d85766e2e364d3fba28cab76d9bce5
	mainproject/Library/metadata/c6/c6e0767b1f8c34890ac245217f4b9731
	mainproject/Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	mainproject/Library/metadata/c9/c93c52b0346bc47bba98678ef68e583f
	mainproject/Library/metadata/ca/ca05f73af9788864fac4cc72d2ad19a2
	mainproject/Library/metadata/ca/ca47cfb3461b64fe69bd87d06ed057c7
	mainproject/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	mainproject/Library/metadata/cb/cb8d7c3c606224969a8ad4d117b53022
	mainproject/Library/metadata/cb/cbcdf494494f148aeb89607e07297737
	mainproject/Library/metadata/cc/cc2e0695659497144afe5a45ed3227ea
	mainproject/Library/metadata/ce/ce8d79c79d11b8f9d00076e98d76c639
	mainproject/Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	mainproject/Library/metadata/d2/d29f814ffc7a24e09b664b355cf09ca9
	mainproject/Library/metadata/d3/d3b77a735b86edd43be695bbeda672e8
	mainproject/Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	mainproject/Library/metadata/d4/d4d16ca3d56fb7142a32d49bbd323836
	mainproject/Library/metadata/d5/d5e8e41006af5e34ca649a6de8116539
	mainproject/Library/metadata/d6/d6757a86ec1429b4aafd086230df0038
	mainproject/Library/metadata/d6/d67cf08569282495b9b0b750a0366fcf
	mainproject/Library/metadata/d6/d6b04e98cd9974bc697c0ea7e7bd48a5
	mainproject/Library/metadata/d6/d6cdc79ec19714fcd980ca3f6ac01a0a
	mainproject/Library/metadata/d9/d9d1fbfcf69364ffd8f9c6ade9ce90fe
	mainproject/Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
	mainproject/Library/metadata/da/dab0806454e4d924491b1b84dddaa6b7
	mainproject/Library/metadata/db/db6ded423daf6e449ac50a3e1f99a36a
	mainproject/Library/metadata/de/de8ff6625ade24f4683d9e56315e84e5
	mainproject/Library/metadata/df/dfbc570a4e0f64a4d8596e79475de90c
	mainproject/Library/metadata/e0/e011ef99892a49744985c66d8c25a20a
	mainproject/Library/metadata/e0/e08601931f0ac4ff4a07d512f7f0e821
	mainproject/Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	mainproject/Library/metadata/e1/e1522ba520a52414787bb00e2b57710b
	mainproject/Library/metadata/e1/e1ae917ad73a5ab4da1d8e9dce478339
	mainproject/Library/metadata/e2/e222162ddb8d34547a133b673221b195
	mainproject/Library/metadata/e2/e228581791012c144900f8d7ccda2491
	mainproject/Library/metadata/e2/e2a3ff0773be22f49a43c0c8fbd50407
	mainproject/Library/metadata/e3/e340b02bd24d6b44cbaaecb9296ea7b5
	mainproject/Library/metadata/e3/e349c3f4b36417b48b65112d7bd0b54e
	mainproject/Library/metadata/e3/e3750e1169490bb42afa8c832ff61859
	mainproject/Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	mainproject/Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08
	mainproject/Library/metadata/e6/e6116533077ca4ab1b3a7106f19dbb06
	mainproject/Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	mainproject/Library/metadata/e7/e776f876d5dea4ac9b419e25457df3ee
	mainproject/Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	mainproject/Library/metadata/e7/e7a88268a460f384cbef52d988810865
	mainproject/Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	mainproject/Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	mainproject/Library/metadata/ea/ea3382008bd084983ad89e60b77e1e4c
	mainproject/Library/metadata/ed/edd43c6f447152a42a46f1ca01a4db20
	mainproject/Library/metadata/ef/ef4dd147aed784fc2968d63b72857249
	mainproject/Library/metadata/ef/ef9bce5dbd11a2c3d000dc0b8d76c639
	mainproject/Library/metadata/ef/efa98d27390e79d4db284aeb5e60d4b9
	mainproject/Library/metadata/f2/f26ba077fc0b44aa98ece4e68647d4e2
	mainproject/Library/metadata/f2/f294454e54694414196e4fbb86e30384
	mainproject/Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	mainproject/Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	mainproject/Library/metadata/f7/f777c032ed7f4114f89cf9fcad4f1b4f
	mainproject/Library/metadata/f7/f7d5f039a8e7848e889e1546d37dc39e
	mainproject/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	mainproject/Library/metadata/fe/fe48ca40e9be666419e7d1a4bf3d808a
	mainproject/Library/metadata/ff/ff1491baf07cabe44967b60b72e8140f
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs