Rough Nametags and healthbars
	deleted:    Assets/Resources/materials/Character.physicsMaterial2D
	deleted:    Assets/Resources/materials/Dark.mat
	deleted:    Assets/Resources/materials/Red.mat
	deleted:    Assets/Resources/materials/plasterwall.mat
	deleted:    Library/metadata/87/8707a36474e2c9940b8ebca6761fe401
	deleted:    test_Data/output_log.txt
Merge branch 'master' of https://github.com/Varkin/QPQuadProQuo

Conflicts:
	Assets/scripts/Character.cs
	Assets/scripts/attacks/projectile.cs
	Assets/scripts/bars.cs
	Assets/textures/materials/Character.physicsMaterial2D
	Assets/textures/materials/Dark.mat
	Assets/textures/materials/plasterwall.mat
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/23/2376effc457f91d42957aaf2024e9616
	Library/metadata/72/724abc8b0616eae48843dca0078ab185
	Library/metadata/9a/9a9b13e798dd51d47acc556c0dfeecbf
	Library/metadata/c4/c4aa2f86b7d67b04790ab4dfd3ee3600
	Library/metadata/e5/e5deac9dcc7c96641ab463b1f5dfbdf6
	test_Data/Managed/Assembly-CSharp.dll
	test_Data/PlayerConnectionConfigFile
	test_Data/mainData
	test_Data/output_log.txt
	test_Data/resources.assets
	test_Data/sharedassets0.assets

	modified:   Assembly-CSharp-vs.csproj
	modified:   Assembly-CSharp.csproj
	new file:   Assets/Resources/bigdebris.prefab
	new file:   Assets/Resources/debris.prefab
	new file:   Assets/Resources/img/slate2img.jpg
	new file:   Assets/Resources/img/slate2img.png
	new file:   Assets/Resources/img/slatetilesimg.png
	new file:   Assets/Resources/materials/Character.physicsMaterial2D
	new file:   Assets/Resources/materials/Dark.mat
	new file:   Assets/Resources/materials/Red.mat
	new file:   Assets/Resources/materials/plasterwall.mat
	modified:   Assets/Resources/projectile.prefab
	modified:   Assets/scripts/Character.cs
	modified:   Assets/scripts/Movement.cs
	modified:   Assets/scripts/NetworkManager.cs
	modified:   Assets/scripts/attacks/defaultAttackScript.cs
	modified:   Assets/scripts/attacks/projectile.cs
	modified:   Assets/scripts/attacks/swarmScript.cs
	modified:   Assets/scripts/bars.cs
	new file:   Assets/textures/materials/Character.physicsMaterial2D
	new file:   Assets/textures/materials/Dark.mat
	new file:   Assets/textures/materials/plasterwall.mat
	modified:   Library/EditorUserBuildSettings.asset
	modified:   Library/InspectorExpandedItems.asset
	modified:   Library/metadata/03/03e23e11c50a5f647a116b037dede09e
	modified:   Library/metadata/0a/0a1cc585a79873249b4e1d86f25aac3f
	modified:   Library/metadata/0b/0b6253afc224a434ba921eba5ef3d7c8
	modified:   Library/metadata/21/2120c55d5420ebf4e81885a13e07308f
	modified:   Library/metadata/21/21afcaae1fe1da043b89997f2186c0f3
	modified:   Library/metadata/25/2537192a7a0b77942bcac1327dced176
	new file:   Library/metadata/3d/3dc5c43581242124b8fde63e788935b3
	modified:   Library/metadata/3f/3f17cbfb144520542a9921452da43137
	new file:   Library/metadata/41/414f5c6a7d7ce34488d2983b0ef795a3
	new file:   Library/metadata/46/46e720cef536bc34eaa349a880823238
	modified:   Library/metadata/49/4939299c3c80cd74794549ce13e64293
	modified:   Library/metadata/4f/4fbf540a8734ae745b351495c97cc076
	new file:   Library/metadata/56/561be9c03d06e5c4db1191db87f18858
	new file:   Library/metadata/5e/5ec793039f3a7fc4d8c57021c516e267
	modified:   Library/metadata/6c/6cccd61fde7217340803e808c58ba0b0
	new file:   Library/metadata/72/724abc8b0616eae48843dca0078ab185
	modified:   Library/metadata/7c/7c42ce9881ac2724e905a3da84367df5
	new file:   Library/metadata/87/8707a36474e2c9940b8ebca6761fe401
	modified:   Library/metadata/87/87eea69d536fc114d99f598ddc4cbf96
	new file:   Library/metadata/97/977ae13f45bb8344391adc2e143dc6d8
	modified:   Library/metadata/a2/a2a041d0a93b7194e8684386b8577414
	modified:   Library/metadata/b6/b6829f74258ee0e429e81218a324a5c4
	modified:   Library/metadata/d2/d25b71ae271eb054dbec2135ff805d2e
	new file:   Library/metadata/e8/e8fc2ca26ab72d44fa7d7b0293d40bca
	modified:   ProjectSettings/TagManager.asset
	modified:   test_Data/PlayerConnectionConfigFile
	new file:   test_Data/output_log.txt