New Map Everyone.
changes
Merge branch 'Alan'

Conflicts:
	Circus_Horror/Assets/Models/Prefabs/Torch.prefab
	Circus_Horror/Assets/Models/Prefabs/Torch.prefab.meta
	Circus_Horror/Assets/Prefabs/Torch.prefab.meta
	Circus_Horror/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Nighttime Water.mat
	Circus_Horror/Assets/UFPS/Base/Content/Art/Weapons/Mace/Materials/torch.mat.meta
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln
Merge branch 'master' into Jurien

Conflicts:
	Circus_Horror/Assets/Scenes/Level01.unity
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln