commiting
Merge branch 'spawning' of https://github.com/toneill818/flaming-dangerzone into spawning

Conflicts:
	Game1/Library/CurrentLayout.dwlt
	Game1/Library/CurrentMaximizeLayout.dwlt
	Game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	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/13/1349125740339994e92e6db311390929
	Game1/Library/metadata/15/156404ce55eed8c4fbbc15f0f12c5e17
	Game1/Library/metadata/1d/1da85f72a7a82bc4eabdbd8f0683bde2
	Game1/Library/metadata/28/285f9a86de9a36a44be04d7a23c37433
	Game1/Library/metadata/43/436b69414b04047fca3929c70df57c4f
	Game1/Library/metadata/7e/7e212db0aa2c00b448aa511ece336f20
	Game1/Library/metadata/7f/7fdfb9a3e0fdf4df880ebc7fa5f56398
	Game1/Library/metadata/a1/a13fed205b1fa3942abfab7ba21463ec
	Game1/Library/metadata/a8/a88b9ed2ae636406d971942299b87be8
	Game1/Library/metadata/b6/b667956babf1f0446a76fa8b99404ab8
	Game1/Library/metadata/bc/bc600cce01eb57a409f4e69025868a2c
	Game1/Library/metadata/ca/caeffedc34d9f4161b7694ad0d84bbd3
	Game1/Library/metadata/f8/f8136785e54fd1d459d2a3a0849fe770
Merge branch 'spawning'

Conflicts:
	Game1/Assets/Scenes/Level01.unity
	Game1/Game1-csharp.sln
	Game1/Game1.sln
	Game1/Library/CurrentLayout.dwlt
	Game1/Library/CurrentMaximizeLayout.dwlt
	Game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	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/13/1349125740339994e92e6db311390929
	Game1/Library/metadata/1d/1da85f72a7a82bc4eabdbd8f0683bde2
	Game1/Library/metadata/28/285f9a86de9a36a44be04d7a23c37433
	Game1/Library/metadata/43/436b69414b04047fca3929c70df57c4f
	Game1/Library/metadata/7e/7e212db0aa2c00b448aa511ece336f20
	Game1/Library/metadata/7f/7fdfb9a3e0fdf4df880ebc7fa5f56398
	Game1/Library/metadata/a1/a13fed205b1fa3942abfab7ba21463ec
	Game1/Library/metadata/a8/a88b9ed2ae636406d971942299b87be8
	Game1/Library/metadata/b6/b667956babf1f0446a76fa8b99404ab8
	Game1/Library/metadata/bc/bc600cce01eb57a409f4e69025868a2c
	Game1/Library/metadata/ca/caeffedc34d9f4161b7694ad0d84bbd3
	Game1/Library/metadata/d2/d2fad65e41e6f3e499b2edf617780f2e
	Game1/Library/metadata/f8/f8136785e54fd1d459d2a3a0849fe770
	Game1/buildalex_Data/Managed/Assembly-CSharp.dll