modified:   Assembly-CSharp.csproj
	modified:   Assets/Resources/Character.prefab
	modified:   Assets/Resources/projectile.prefab
	modified:   Assets/scripts/Attack.cs
	modified:   Assets/scripts/Movement.cs
	modified:   Assets/scripts/attacks/defaultAttackScript.cs
	modified:   Assets/scripts/attacks/noCollisionScript.cs
	modified:   Assets/scripts/attacks/particles.cs
	modified:   Assets/scripts/attacks/projectile.cs
	modified:   Assets/scripts/attacks/swarmScript.cs
	modified:   Assets/textures/materials/Character.physicsMaterial2D
	modified:   Library/CurrentLayout.dwlt
	modified:   Library/ScriptAssemblies/Assembly-CSharp.dll
	modified:   Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	deleted:    Library/ScriptAssemblies/CompilationCompleted.txt
	modified:   Library/assetDatabase3
	modified:   Library/guidmapper
	modified:   Library/metadata/09/09e880274162ec14aa50f576f8ac8440
	modified:   Library/metadata/21/2120c55d5420ebf4e81885a13e07308f
	modified:   Library/metadata/49/4939299c3c80cd74794549ce13e64293
	modified:   Library/metadata/6c/6cccd61fde7217340803e808c58ba0b0
	modified:   Library/metadata/6e/6e08d0d4c4d4fc843a62b3cf590084dc
	modified:   Library/metadata/d2/d25b71ae271eb054dbec2135ff805d2e
	modified:   Library/metadata/e5/e5deac9dcc7c96641ab463b1f5dfbdf6
	modified:   QPQuadProQuo-csharp.sln
	modified:   QPQuadProQuo.sln
	modified:   QPQuadProQuo.userprefs
	modified:   test_Data/Managed/Assembly-CSharp.dll
	modified:   test_Data/PlayerConnectionConfigFile
	modified:   test_Data/mainData
	modified:   test_Data/output_log.txt
	modified:   test_Data/resources.assets
	deleted:    testbuild.exe
Merge branch 'master' of https://github.com/Varkin/QPQuadProQuo

Conflicts:
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/09/09e880274162ec14aa50f576f8ac8440
	Library/metadata/21/2120c55d5420ebf4e81885a13e07308f
	Library/metadata/49/4939299c3c80cd74794549ce13e64293
	Library/metadata/6c/6cccd61fde7217340803e808c58ba0b0
	Library/metadata/6e/6e08d0d4c4d4fc843a62b3cf590084dc
	Library/metadata/d2/d25b71ae271eb054dbec2135ff805d2e
	Library/metadata/e5/e5deac9dcc7c96641ab463b1f5dfbdf6
	QPQuadProQuo-csharp.sln
	QPQuadProQuo.sln
	QPQuadProQuo.userprefs

	modified:   .gitignore
	deleted:    Assembly-CSharp (Zeus's conflicted copy 2014-04-07).csproj
	deleted:    Assembly-CSharp (Zeus's conflicted copy 2014-04-14).csproj
	deleted:    Assembly-CSharp-vs (Zeus's conflicted copy 2014-04-07).csproj
	deleted:    Assembly-CSharp-vs (Zeus's conflicted copy 2014-04-14).csproj
	deleted:    Assembly-CSharp-vs.csproj
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-02).userprefs
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-07 (1)).userprefs
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-07).sln
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-07).userprefs
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-14).sln
	deleted:    CastleRecovery (Zeus's conflicted copy 2014-04-14).userprefs
	deleted:    CastleRecovery-csharp (Zeus's conflicted copy 2014-04-07).sln
	deleted:    CastleRecovery-csharp (Zeus's conflicted copy 2014-04-14).sln
	deleted:    CastleRecovery-csharp.sln
	deleted:    CastleRecovery-master-csharp.sln
	deleted:    CastleRecovery-master.sln
	deleted:    CastleRecovery-master.userprefs
	deleted:    CastleRecovery.sln
	deleted:    CastleRecovery.userprefs
	deleted:    Library/AnnotationManager
	deleted:    Library/AssetImportState
	deleted:    Library/AssetServerCacheV3
	deleted:    Library/AssetVersioning.db
	deleted:    Library/BuildPlayer.prefs
	deleted:    Library/BuildSettings.asset
	deleted:    Library/CurrentLayout (Zeus's conflicted copy 2014-04-01).dwlt
	deleted:    Library/CurrentLayout (Zeus's conflicted copy 2014-04-02).dwlt
	deleted:    Library/CurrentLayout (Zeus's conflicted copy 2014-04-07 (1)).dwlt
	deleted:    Library/CurrentLayout (Zeus's conflicted copy 2014-04-07).dwlt
	deleted:    Library/CurrentLayout (Zeus's conflicted copy 2014-04-14).dwlt
	deleted:    Library/CurrentMaximizeLayout.dwlt
	deleted:    Library/EditorUserBuildSettings.asset
	deleted:    Library/EditorUserSettings.asset
	deleted:    Library/FailedAssetImports.txt
	deleted:    Library/InspectorExpandedItems.asset
	deleted:    Library/MonoManager.asset
	deleted:    Library/ProjectSettings.asset
	deleted:    Library/ScriptMapper
	deleted:    Library/assetDatabase3 (Zeus's conflicted copy 2014-04-02)
	deleted:    Library/assetDatabase3 (Zeus's conflicted copy 2014-04-07)
	deleted:    Library/assetDatabase3 (Zeus's conflicted copy 2014-04-14)
	deleted:    Library/expandedItems
	deleted:    Library/metadata/00/00000000000000001000000000000000
	deleted:    Library/metadata/00/00000000000000002000000000000000
	deleted:    Library/metadata/00/00000000000000003000000000000000
	deleted:    Library/metadata/00/00000000000000004000000000000000
	deleted:    Library/metadata/00/00000000000000004100000000000000
	deleted:    Library/metadata/00/00000000000000005000000000000000
	deleted:    Library/metadata/00/00000000000000005100000000000000
	deleted:    Library/metadata/00/00000000000000006000000000000000
	deleted:    Library/metadata/00/00000000000000006100000000000000
	deleted:    Library/metadata/00/00000000000000007000000000000000
	deleted:    Library/metadata/00/00000000000000008000000000000000
	deleted:    Library/metadata/00/00000000000000009000000000000000
	deleted:    Library/metadata/00/0000000000000000a000000000000000
	deleted:    Library/metadata/00/0000000000000000b000000000000000
	deleted:    Library/metadata/00/0000000000000000c000000000000000
	deleted:    Library/metadata/03/03e23e11c50a5f647a116b037dede09e
	deleted:    Library/metadata/0a/0a1cc585a79873249b4e1d86f25aac3f
	deleted:    Library/metadata/0b/0b6253afc224a434ba921eba5ef3d7c8
	deleted:    Library/metadata/16/161c1fcb227ce3c4fb4d099a0443c36b
	deleted:    Library/metadata/18/18351d626464b364b96cd1ef7f8deb87
	deleted:    Library/metadata/21/21afcaae1fe1da043b89997f2186c0f3
	deleted:    Library/metadata/25/2537192a7a0b77942bcac1327dced176
	deleted:    Library/metadata/32/32d7625fcbd7683488f2839ce0f217b6
	deleted:    Library/metadata/35/354be8dd872ba4b46a0451a2263e667d
	deleted:    Library/metadata/3d/3d1486f3785f5e046afebdb479a67952
	deleted:    Library/metadata/3f/3f17cbfb144520542a9921452da43137
	deleted:    Library/metadata/41/414f5c6a7d7ce34488d2983b0ef795a3
	deleted:    Library/metadata/46/46e720cef536bc34eaa349a880823238
	deleted:    Library/metadata/4a/4a92f2e19c21f704793948048803df0c
	deleted:    Library/metadata/4f/4fbf540a8734ae745b351495c97cc076
	deleted:    Library/metadata/56/561be9c03d06e5c4db1191db87f18858
	deleted:    Library/metadata/5e/5ec793039f3a7fc4d8c57021c516e267
	deleted:    Library/metadata/5f/5f51ececb66f7db41a96a66c0ca411e8
	deleted:    Library/metadata/72/7288b7bfbc13e9d4b85ef91adb379fd4
	deleted:    Library/metadata/7c/7c42ce9881ac2724e905a3da84367df5
	deleted:    Library/metadata/81/81923a92dd9176748816fdee11d05a28
	deleted:    Library/metadata/87/87eea69d536fc114d99f598ddc4cbf96
	deleted:    Library/metadata/92/926405bef84803a43b985539ac685486
	deleted:    Library/metadata/97/977ae13f45bb8344391adc2e143dc6d8
	deleted:    Library/metadata/99/993fe278a0fc9304eb14a4526655d87f
	deleted:    Library/metadata/9a/9a9b13e798dd51d47acc556c0dfeecbf
	deleted:    Library/metadata/a2/a2a041d0a93b7194e8684386b8577414
	deleted:    Library/metadata/aa/aaf23c440101be440a43b70851043d4b
	deleted:    Library/metadata/ae/ae45c1468f3e13045b60b6c1e3d63852
	deleted:    Library/metadata/b6/b6829f74258ee0e429e81218a324a5c4
	deleted:    Library/metadata/c4/c4aa2f86b7d67b04790ab4dfd3ee3600
	deleted:    Library/metadata/d6/d6f1e9397dfca934689cb8d4d28059f5
	deleted:    Library/metadata/eb/eb46853aa563a6a4eb46bd1e5a8d54cb
server stuffs