Merge branch 'Jurien'
Merge branch 'Jurien'
Merge branch 'Jurien'
Merge branch 'Jurien'
Merge branch 'master' into Alan
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
Merge branch 'master' of https://github.com/owyoow/Circus-Horror

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
changes
Merge branch 'Alan'

Conflicts:
	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
changes
changes
Merge branch 'master' of https://github.com/owyoow/Circus-Horror