New attack system implemented
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assets/Scripts/Warrior.cs
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/DungerMan.userprefs
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3
	DungerMan/Library/expandedItems
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/04/04b13f8da4f3e497fa11dce2fe83b59f
	DungerMan/ProjectSettings/DynamicsManager.asset
	DungerMan/ProjectSettings/TagManager.asset