Merged Alan's project

Added Torch
removed floating arm in the level
Merge branch 'Jurien'
added torch blowout animation

now you also have to put the torch in a flame to turn it back on
Merge branch 'Jurien'
anitation tweaks
Merge branch 'Jurien'
added character that chases you with sounds
Merge branch 'Jurien'
Merge branch 'master' into Alan
added torch model and made scale timer
minor changes
Merge branch 'Jurien'
Full Map Set-up
changes
map
new project
changes
Merge branch 'Alan'

Conflicts:
	Circus_Horror/Assembly-CSharp-Editor-vs.csproj
	Circus_Horror/Assembly-CSharp-Editor.csproj
	Circus_Horror/Assembly-CSharp-firstpass-vs.csproj
	Circus_Horror/Assembly-CSharp-firstpass.csproj
	Circus_Horror/Assembly-CSharp-vs.csproj
	Circus_Horror/Assembly-CSharp.csproj
	Circus_Horror/Assembly-UnityScript-firstpass-vs.unityproj
	Circus_Horror/Assembly-UnityScript-firstpass.unityproj
	Circus_Horror/Assets/Scenes/Level01.unity
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln
	Circus_Horror/ProjectSettings/EditorBuildSettings.asset
Merge branch 'Alan'

Conflicts:
	Circus_Horror/Assembly-CSharp-Editor-vs.csproj
	Circus_Horror/Assembly-CSharp-Editor.csproj
	Circus_Horror/Assembly-CSharp-firstpass-vs.csproj
	Circus_Horror/Assembly-CSharp-firstpass.csproj
	Circus_Horror/Assembly-CSharp-vs.csproj
	Circus_Horror/Assembly-CSharp.csproj
	Circus_Horror/Assembly-UnityScript-firstpass-vs.unityproj
	Circus_Horror/Assembly-UnityScript-firstpass.unityproj
	Circus_Horror/Assets/Scenes/Level01.unity
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln
	Circus_Horror/ProjectSettings/EditorBuildSettings.asset