Gameplay stuff
Merge branch 'master' of https://github.com/kazenotenshi/naovaitercopa

Conflicts:
	Runner/Assembly-CSharp-vs.csproj
	Runner/Assembly-CSharp.csproj
	Runner/Assembly-UnityScript-vs.unityproj
	Runner/Assembly-UnityScript.unityproj
	Runner/Assets/NaoVaiTerCopaCore/Scripts/CupPlayerManager.cs
	Runner/Library/ScriptAssemblies/Assembly-CSharp.dll
	Runner/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Runner/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Runner/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Runner/Library/assetDatabase3
	Runner/Library/guidmapper
	Runner/Library/metadata/00/0015b5fef54d3104aa7a9ce92cdca719
	Runner/Library/metadata/01/01041b3e39c568e43a4c5fbd4344abe1
	Runner/Library/metadata/06/068ae43b0471529488b1a03825a43cd1
	Runner/Library/metadata/09/093e035e557358d4c9bbeda18e61109a
	Runner/Library/metadata/0a/0a1c3b604edfb8b43b36fdc597896321
	Runner/Library/metadata/0e/0e132cc4a636a45c18c979efe7c05761
	Runner/Library/metadata/11/116cfcfaec51a394b80c47b375b048c8
	Runner/Library/metadata/12/12ae39bda932a194e931efd40d817cb9
	Runner/Library/metadata/13/131319852e526274ca745bcdd96c6d4d
	Runner/Library/metadata/14/1429546611d45ac4e93814f210daaeb4
	Runner/Library/metadata/14/14861d4a80c51d640b0c514eb2b3d850
	Runner/Library/metadata/14/14f1e3fd8b7374f26a708c137ea30fa4
	Runner/Library/metadata/16/16c876e8abdf94546905a0d8098076a5
	Runner/Library/metadata/23/23160f9e9e93ad542a30ef3ccc03c462
	Runner/Library/metadata/26/2644aff2ad4c50a44807ce1c60eb6cf0
	Runner/Library/metadata/2b/2b29a744f6be94e47bc05ceae52d1dc3
	Runner/Library/metadata/2c/2c0c1fbaef042f64f9380149d8ff5557
	Runner/Library/metadata/2d/2d4bb8d1f40196e45aeaefeafc87f6bc
	Runner/Library/metadata/33/33001589000af2546ad01cbbf50e0878
	Runner/Library/metadata/3a/3a59893f776b8f04ca870bb605874a1d
	Runner/Library/metadata/3f/3f59f8b84f9015948ab146dac3024804
	Runner/Library/metadata/44/44ad7a5ee623490428d5188b510a2080
	Runner/Library/metadata/46/46b010b8d0ddffb49ba48b192e8ad60a
	Runner/Library/metadata/47/47a42049e8e83b24f980ba646e23bfdf
	Runner/Library/metadata/4d/4db23a1d25825314681a9655340d41a3
	Runner/Library/metadata/4d/4dd6e3e915c699647a56c0f0634173ae
	Runner/Library/metadata/4f/4f0d8d40a75b696448cc4c037e1f9cf2
	Runner/Library/metadata/50/507d23d694912a14b920194a126df6d5
	Runner/Library/metadata/54/54e18b3d7ca6b7d4dbdbcfeca45ea672
	Runner/Library/metadata/57/576dbee17b1641d47bd0070795304478
	Runner/Library/metadata/5e/5e7fdac7dcf4d4c438ec0d7517a640d7
	Runner/Library/metadata/5f/5f914c3335ab6ba44a9daf4bd3201a60
	Runner/Library/metadata/5f/5fb996901a4575545ae285289ad9e670
	Runner/Library/metadata/63/63d71a5313ec45540ad3d332b66adbfe
	Runner/Library/metadata/68/680ca848188da9c4381d4fad85a4fa7b
	Runner/Library/metadata/6b/6b7fab6de96e3174aa04b02f4674a7d0
	Runner/Library/metadata/74/742ac43d91719634888d966249b8bb86
	Runner/Library/metadata/78/78630f2c908a31b44a7d01f76c0cb5fc
	Runner/Library/metadata/79/79d305885909927458d882b3e64e180e
	Runner/Library/metadata/80/801f239605c3bda42bfcc6590bf53610
	Runner/Library/metadata/83/8341619770a7b944dae5366ec89ac0b4
	Runner/Library/metadata/84/846eefbf6f1c06c4b867ee654d56773f
	Runner/Library/metadata/85/854f5da68cfa6f7468ede7ed2474c673
	Runner/Library/metadata/88/883b54c378b435e40b7f817c2b2aaebb
	Runner/Library/metadata/8a/8a3dd0e0d1735f74bab2d405ee0fa7d3
	Runner/Library/metadata/90/90af579e137482249b3d68b263da4ce0
	Runner/Library/metadata/91/91979c1d51462fb43a378f46b6e13c52
	Runner/Library/metadata/99/992a8a8e8f0779d45849a07c1aaab434
	Runner/Library/metadata/9d/9dea63fe8448e164a90a60eb2280b813
	Runner/Library/metadata/a2/a247d40ea99869445bb627d411c259ae
	Runner/Library/metadata/a2/a2d6ce8a40575384ab6a9d81cbaeee93
	Runner/Library/metadata/a4/a42b0969673540e449329902f68e8e75
	Runner/Library/metadata/a7/a7168e3fb8fa6794fa99e7ee0e77160b
	Runner/Library/metadata/aa/aa6ba8f3145c7ea4a8a00c503346ad8e
	Runner/Library/metadata/aa/aaf5b1bdb9cf4144c9f97d0eb2489aeb
	Runner/Library/metadata/af/affdeac3cc939094f89249f2daab882e
	Runner/Library/metadata/b1/b15f1de5453c42046a3f64ca73221a81
	Runner/Library/metadata/b6/b6fbbb97148eace49b830bbbf3e84977
	Runner/Library/metadata/b8/b857349ed795efd4482c9db5a9833003
	Runner/Library/metadata/b9/b9dab4fbb6f8aed43b4c5c9e0af472e3
	Runner/Library/metadata/ba/bae8dde961280244a925f1b12e08a36e
	Runner/Library/metadata/bc/bce396a771870e94e8b19555832dc1f5
	Runner/Library/metadata/bd/bd2a22e3d5601444f95ff33120ecd493
	Runner/Library/metadata/be/be43b3f7121ea07468926ed173f62246
	Runner/Library/metadata/c0/c0530489002e4884d96aea1c96b2da68
	Runner/Library/metadata/c1/c169c1ce133475c49a100cd4085db2a9
	Runner/Library/metadata/c2/c2195577c877ea5448cc28341d488e3f
	Runner/Library/metadata/c3/c30edf2d99ed74bd88b6e2fd7cca9ae3
	Runner/Library/metadata/c3/c322eeefb43e940139f14915f1e7ade1
	Runner/Library/metadata/c5/c5386ef6ade03904197c32a34ad510e7
	Runner/Library/metadata/c7/c7634b80840fc2048b9708e224a988c9
	Runner/Library/metadata/c8/c82b64b97c96e154388bc2af110136a2
	Runner/Library/metadata/c9/c95c8415cc3338647a0fca800e2ee754
	Runner/Library/metadata/c9/c96201e01ca1bb9419d46b1ddd13cb7e
	Runner/Library/metadata/c9/c9d043c315c344d2995f9d7bb71d29fa
	Runner/Library/metadata/ca/ca6ad7aeb39da4fb2adda8ef5dd4aa7a
	Runner/Library/metadata/ce/cef5ff4e7fff13e4389dfb51f3fdd9ac
	Runner/Library/metadata/d1/d155fa8857a4fcb40b08e2725a6839d7
	Runner/Library/metadata/d3/d3e7e04be336b9c4e8185b8cb1e83327
	Runner/Library/metadata/db/db614a5c441774048a2cb84c589bc9eb
	Runner/Library/metadata/dd/dd9b640d841274c0689bb13353c62e60
	Runner/Library/metadata/e1/e10ac86c1fed7304fbb5c8f24affe22f
	Runner/Library/metadata/e2/e2dc9e69fe891cd4f875a2e9c84ac55a
	Runner/Library/metadata/e6/e65acf1aeba422a4294807f3047c5ce7
	Runner/Library/metadata/e6/e6e2488cec7c82a4eb53a24b43cdd094
	Runner/Library/metadata/e7/e73ac7d065f44544ca8b29a50b2861ba
	Runner/Library/metadata/eb/eb84a8429cac91b488911169238642ec
	Runner/Library/metadata/ec/ec2d1e102ff8f404b9d5e67109c4da12
	Runner/Library/metadata/f7/f724d193138728c4d8dad761a9a3a294
	Runner/Runner-csharp.sln
	Runner/Runner.sln
	Runner/Runner.userprefs
Build OK!
Metadata maluco.