Merge branch 'master' of github.com:Meph74/Project42

Conflicts:
	.gitignore
	Assets/Materials/ElectricArcMaterial.mat
	Assets/Materials/GlowPlane.mat
	Assets/Materials/healthbar_player.mat
	Library/ScriptAssemblies/Assembly-Boo-Editor.dll
	Library/ScriptAssemblies/Assembly-Boo-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/07/0723fdd1d7ab0e447bf8a9f28e4a19a1
	Library/metadata/1f/1fd8c9823ece54fd298563b7c0d629ae
	Library/metadata/57/57dae6752ad0b7d47b1efb90ad62208c
	Library/metadata/8f/8f72bd63908224f2bb00f3844f7d1018
	Library/metadata/91/916de0f971c01479cbfc7f8c3bee15e8
	Library/metadata/9d/9dd44486e52804400af92c5521e8dc14
	Library/metadata/c9/c9287835a9b6d45dea066df1ee5f789d
	Library/metadata/ca/ca159162814614f2e96f37b3192a5868
	Library/metadata/fd/fd08846c0adad44c6a8cded82a0fc675
	Project42-csharp.sln
	Project42.sln
new level addition