Wizard attack in progress
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/Assets/Resources/ProjectileWarriorNormal.prefab
	DungerMan/DungerMan.userprefs
	DungerMan/Library/CurrentMaximizeLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3