merging main branch
Merge branch 'master' into Alex
Merge branch 'master' into Alex

Conflicts:
	Game1/Assets/Resources/Materials.meta
	Game1/Game1-csharp.sln
	Game1/Game1.sln
	Game1/Library/CurrentMaximizeLayout.dwlt
	Game1/Library/ScriptAssemblies/Assembly-CSharp.dll
	Game1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Game1/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Game1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Game1/Library/assetDatabase3
	Game1/Library/guidmapper
	Game1/Library/metadata/28/285f9a86de9a36a44be04d7a23c37433
	Game1/Library/metadata/35/3558fa667d9d6bc438652a2cbc3d82bb
	Game1/Library/metadata/72/721a7addd3794814f8c037089c582971
	Game1/Library/metadata/a8/a88b9ed2ae636406d971942299b87be8
	Game1/Library/metadata/d0/d09167a98e5554449ad334c42ab24da7
	Game1/Temp/__EditModeScene
added ability to die and kill spiders after 3 shots
trying
audio
adding audio source
adding sound to intro
Merge branch 'Alex' of https://github.com/toneill818/flaming-dangerzone into Alex
crap
try again
Merge branch 'Alex' of https://github.com/toneill818/flaming-dangerzone into Alex

Conflicts:
	Game1/Library/ScriptAssemblies/Assembly-CSharp.dll
Merge branch 'Alex'
committing all changes