Last Commit to Master
melee attack and dot damage script updates
fixed the dot grenade and tested melee weapon
fixed dot grenade and tested melee script
Merge branch 'Marcus' into Programmers

Conflicts:
	MI/Assembly-CSharp-vs.csproj
	MI/Assembly-CSharp.csproj
	MI/Assembly-UnityScript-vs.unityproj
	MI/Assembly-UnityScript.unityproj
	MI/Assets/Programming/Marcus/Scenes/gunsFromScratch.unity
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Materials/Fire Add.mat
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Materials/FlameC.mat
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Materials/FlameD.mat
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Textures/Fireball.psd.meta
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Textures/flameC.tif.meta
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Textures/flameD.tif.meta
	MI/Assets/Programming/Marcus/Standard Assets/Particles/Sources/Textures/foam.tga.meta
	MI/Assets/Programming/Marcus/Weapons/Prefabs/Resources/dotGrenadeExplosion.prefab
	MI/Assets/Programming/Marcus/Weapons/Scripts/DamageController.cs
	MI/Assets/Programming/Marcus/Weapons/Scripts/MeleeAttack.cs
	MI/Assets/Programming/Marcus/Weapons/Scripts/dotGrenadeDmgScript.cs
	MI/Assets/Programming/Marcus/Weapons/Scripts/grenadeExplosionScript.cs
	MI/Library/AssetServerCacheV3
	MI/Library/CurrentLayout.dwlt
	MI/Library/ScriptAssemblies/Assembly-CSharp.dll
	MI/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	MI/Library/ScriptAssemblies/Assembly-UnityScript.dll
	MI/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	MI/Library/assetDatabase3
	MI/Library/expandedItems
	MI/Library/guidmapper
	MI/Library/metadata/01/01174e4954348268c150b6f98c48939f
	MI/Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	MI/Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	MI/Library/metadata/07/07164b862e22de247b628437b6257286
	MI/Library/metadata/07/073946e94d57ac04fb345d5c28d21992
	MI/Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	MI/Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	MI/Library/metadata/08/08ff035ba1ad1304cb4b8f2a08459586
	MI/Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	MI/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	MI/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	MI/Library/metadata/0f/0f2d0f181ee54244fad47ce4e250072c
	MI/Library/metadata/12/12747bdca86d344c2a4f1ea2bb362f17
	MI/Library/metadata/13/13035082065cd3f4ba0c90de7a9bff78
	MI/Library/metadata/13/13b03a2617ec54046959ca40ab9aaabd
	MI/Library/metadata/14/14367c4a7f3ec7c4b8a664b08c01fb99
	MI/Library/metadata/14/144b203f383094d16b1f336c74c47326
	MI/Library/metadata/16/169b10ce10f4327cb9f40f6b117ed8d7
	MI/Library/metadata/18/182faa68ef263a449b0bafb425ad564f
	MI/Library/metadata/1a/1a2474dc6be4fa546a73144543ba6b65
	MI/Library/metadata/1a/1a5d8cd24a805cd44b00c7f1e1e4d287
	MI/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	MI/Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	MI/Library/metadata/1e/1e6cc5f37ddcac94eaac02afdfb29dab
	MI/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	MI/Library/metadata/23/23471d5318bdfc04db3a2ba172347e6c
	MI/Library/metadata/29/29a19396b0adc3044a55637597906a30
	MI/Library/metadata/29/29f2844e1d89a4ed09e527cd2039d6ea
	MI/Library/metadata/2a/2a250e102fabe2a4bbf97f63a6f6fa9d
	MI/Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	MI/Library/metadata/2a/2acf9c8e812eff6459715d2b3dce2c96
	MI/Library/metadata/2a/2aeae223143045c4585c0677a59554c7
	MI/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	MI/Library/metadata/2c/2cb88696192ce3f45b06de7ae576ff2f
	MI/Library/metadata/2e/2e54a0d30b500e943b4092026b7c093d
	MI/Library/metadata/32/327835a878f496675e402fdba3e0a4bc
	MI/Library/metadata/34/342afe6f226bae74c8d166c450ff6b9c
	MI/Library/metadata/34/34571a88566816540ba1be2d581ad505
	MI/Library/metadata/34/34c9fcec00ce63b49a6725d4eadead19
	MI/Library/metadata/37/3771197ed073a5b43a00de52d20e95fe
	MI/Library/metadata/3a/3a09320447d2f4b4792275add3115112
	MI/Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	MI/Library/metadata/3d/3ddb50e323b793449ad89bd605735e35
	MI/Library/metadata/3f/3fbc34d51ee4155dc17d8f49133f44ad
	MI/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	MI/Library/metadata/44/44b3febaf5142a5429938ef0a0de2395
	MI/Library/metadata/45/459ba69fdce4f00479325042014b9061
	MI/Library/metadata/45/45c8029c730449a4e87ab4eb0b841658
	MI/Library/metadata/46/46e871058d317418fab60bb84a290869
	MI/Library/metadata/46/46f20506974b7ed4abb2781fe67ab81c
	MI/Library/metadata/46/46f8dd6760ccb814d98893ff6c44ef82
	MI/Library/metadata/4b/4b31b1caadab1ee4b8606c9f35713992
	MI/Library/metadata/4c/4c97e3c4b8a0f8143b88d6a7e5d07bff
	MI/Library/metadata/4e/4e282ba38c886aa408996340b766a97f
	MI/Library/metadata/4e/4e363f2380155c34b909463f10014afd
	MI/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	MI/Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	MI/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	MI/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	MI/Library/metadata/54/542f86e4e34b523499e0f073b1355e1a
	MI/Library/metadata/54/5465efda2d3782c42b8daea51a2a3e64
	MI/Library/metadata/55/55138788dba65974aab174b5aa539797
	MI/Library/metadata/55/555d32e2e37aea2498b4aa696dac3bfc
	MI/Library/metadata/56/5692846c5ce8f4ee08ef64bec4aad0bd
	MI/Library/metadata/57/573a55dd964f5c542b526e66dfa87984
	MI/Library/metadata/5a/5a248cb03e4cd9244ae75cc2258f8ead
	MI/Library/metadata/5b/5b9365ffc47a07f4e89de35d661db0e9
	MI/Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	MI/Library/metadata/5c/5c8566dc54da32d42a756da1058b2b74
	MI/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	MI/Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	MI/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	MI/Library/metadata/64/642367443312c224bb40c297365867ac
	MI/Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	MI/Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	MI/Library/metadata/66/66dcf733d7f27474d8e5b93a6e65c49f
	MI/Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	MI/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	MI/Library/metadata/6b/6b2345f07d9ee394597f275aa0a891d3
	MI/Library/metadata/6c/6c34bc6afae11ff44a5be15fbd128b8c
	MI/Library/metadata/6c/6cb852371277fe74581601ae7c20d803
	MI/Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	MI/Library/metadata/72/728bfb8e199210d4bb0caf24eea91201
	MI/Library/metadata/72/72eb92acf03689a4b86cfd6d21d6d9bc
	MI/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	MI/Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	MI/Library/metadata/79/79ee47d0d7d8347459a63ae804788244
	MI/Library/metadata/7a/7a598717ded698c4dbdd57c2260fa1e1
	MI/Library/metadata/7b/7b277829b0b4991f100024a80dbc5c14
	MI/Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	MI/Library/metadata/7d/7da59632ac834ab4aa472eda61f3b04b
	MI/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	MI/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	MI/Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	MI/Library/metadata/7f/7f35a22445512b542b79e7462a6b3da1
	MI/Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	MI/Library/metadata/83/8398816c782a4b440838362e0e3562d0
	MI/Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	MI/Library/metadata/85/85f253546f8cb4643a334dca1e67b243
	MI/Library/metadata/86/8600316ae23e146108aa156f81a2d56f
	MI/Library/metadata/88/88324f760c579473199bfbc4f1073097
	MI/Library/metadata/89/8959d67f0729d494ebc17831e087852e
	MI/Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	MI/Library/metadata/8e/8e303788a4e296443b33942a5be85049
	MI/Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	MI/Library/metadata/8f/8fb9ed052c43a7a48883fef6b5e62a51
	MI/Library/metadata/91/91783c7d94a48ad48b65b7444702d00a
	MI/Library/metadata/92/92e6d9926a8c43d49a79f0d3d603277a
	MI/Library/metadata/92/92e7d3179232fd84e8403837e9ce7330
	MI/Library/metadata/94/94899e9c0c7565f41b94254181414d70
	MI/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	MI/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	MI/Library/metadata/9a/9af7c375431d02749b2fec567023bb61
	MI/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	MI/Library/metadata/9b/9bdfe58ebdc319a4fa93aff523e6c0a0
	MI/Library/metadata/9c/9c5bd6070cd5d481abdb8755ff51fd7a
	MI/Library/metadata/9c/9c7f793f82a4f7bda3662a9a2f23142e
	MI/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	MI/Library/metadata/9e/9e681708e21f3c24185e0d2296d9a374
	MI/Library/metadata/a0/a030efe10935fec45a84afaecba89fba
	MI/Library/metadata/a0/a0b5e5e2e136912408b21ea2111908d7
	MI/Library/metadata/a2/a28540d6bcf674c1bb3dd7af7de640fc
	MI/Library/metadata/a3/a3d98589022d42e4980d30aea5a45884
	MI/Library/metadata/a3/a3edf03857d33e5449c8b9948ad9f623
	MI/Library/metadata/a4/a4ea7d51a92464447a76c94795364c02
	MI/Library/metadata/a7/a729e0563b6401d438831e54bc7767e8
	MI/Library/metadata/a8/a864fa08becb409408f3292f482edc0c
	MI/Library/metadata/aa/aac96e650db611041a371bcd1bb441cc
	MI/Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	MI/Library/metadata/ab/ab9e312b88a751a498c614ca4531f95c
	MI/Library/metadata/ac/ac3bac5fc95ccf04f80624822ce8d47c
	MI/Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	MI/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	MI/Library/metadata/af/af4465c7aa1400a6573c907831d716c9
	MI/Library/metadata/b1/b1771bdc25da82747aef85aa5886bf2f
	MI/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	MI/Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	MI/Library/metadata/b9/b9c4253b8382c4842bb255999d37f53b
	MI/Library/metadata/ba/baa58e5d23374c9479287d93ce1c2e2a
	MI/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	MI/Library/metadata/bb/bb890ce18cc0c554abfbb54d32b4add8
	MI/Library/metadata/bb/bb9f4eef3f088c94e834a3f8d28fcd8c
	MI/Library/metadata/bd/bd943c792514675e464dfc7a8c26d3e0
	MI/Library/metadata/be/be07eb6c6ab307a44a4736869ca33daa
	MI/Library/metadata/be/bef764d3d7afc3d49a6c109fa3e1def8
	MI/Library/metadata/c3/c31fa1a55f0c141ccb34e61d6bb78569
	MI/Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	MI/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	MI/Library/metadata/c9/c994fde8e6848a3771503f184e0c9cb4
	MI/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	MI/Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	MI/Library/metadata/ca/caf20877f7cce4351a9b1cfef8dcd186
	MI/Library/metadata/ce/ce073cd2303ddc841a6f19e1b0384862
	MI/Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	MI/Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	MI/Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	MI/Library/metadata/d6/d6c53d165df3dde4196d02b769c2c775
	MI/Library/metadata/d8/d814d610f0abc7e4b9ec3ad7e83897f3
	MI/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	MI/Library/metadata/dd/dd9c772607f822744b192311f2845886
	MI/Library/metadata/df/df42ef794d3e0441783057cf822a525c
	MI/Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	MI/Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	MI/Library/metadata/e1/e1dd10b0f5089d943b6738812371595b
	MI/Library/metadata/e2/e260b3a7016ac404e92c8697698c4bfe
	MI/Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	MI/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	MI/Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	MI/Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	MI/Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	MI/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	MI/Library/metadata/e8/e8c39b40e49b1694280685ea1fb434a0
	MI/Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	MI/Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	MI/Library/metadata/ea/ea684cdee9dff1f4cb1edd3429787c94
	MI/Library/metadata/eb/eb751fe0395492947abb35f626abba73
	MI/Library/metadata/ee/eef3bcfe0652a234298861e780dab450
	MI/Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	MI/Library/metadata/f4/f4992116de61ffe4ab87e3fc0654c902
	MI/Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	MI/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	MI/MI-csharp.sln
	MI/MI.sln
	MI/MI.userprefs