finished sledgehammer
Working sledgehammer
Merge branch 'master' of https://github.com/Blakenator/ZombieGame

Conflicts:
	fpswithted/Assets/Scenes/FPS test.unity
	fpswithted/Library/InspectorExpandedItems.asset
	fpswithted/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	fpswithted/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	fpswithted/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	fpswithted/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	fpswithted/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	fpswithted/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	fpswithted/Library/ScriptAssemblies/Assembly-UnityScript.dll
	fpswithted/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	fpswithted/Library/assetDatabase3
	fpswithted/Library/guidmapper
	fpswithted/Library/metadata/88/88860eb11309aec439820869e380a422
Merge branch 'refs/heads/sledgehammer-update'