ningun Cambio
holykiller
lol
Merge branch 'master' of https://github.com/holykiller/FightOn

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	FightOn-csharp.sln
	FightOn.sln
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/10/10d04920b605871428dd3da07ef61b90
	Library/metadata/11/11d5b50b416fe6a49a3ddd6a134fd462
	Library/metadata/1b/1b9961f63a7efa741aff09b0763bcd50
	Library/metadata/24/2440d6b5d043e4b468bd78584602a651
	Library/metadata/50/507c7f5ccae698344ba76fce1a95edf7
	Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Library/metadata/57/5710a1f47af2947699139509aae39149
	Library/metadata/57/57c605b29c9086142a965217d9d4cf46
	Library/metadata/6a/6afb831c0ff98db4fa491ee3e98fa445
	Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
	Library/metadata/a8/a82c2ad46cbe419438ed8aead6aeb6bc
	Library/metadata/a9/a921cbbfcdae57e4091c59bee4a35a7a
	Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Library/metadata/bb/bb60691295eb4064b8b26656102431aa
	Library/metadata/bd/bd4774fa87864204485d94aaba163485
	Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Library/metadata/cf/cfccff221741d0f4f9a4e65c6027931f
	Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8
	ProjectSettings/GraphicsSettings.asset
	Temp/tempFile