Removed Files
repaired the project
Updating my project.
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/Assets/Scenes/Level01.unity
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln
Because of other assignment. Only did a small bit so we have some props and fx in there.
small changes
fire changes
Map Layout Change. Water goes around towards the circus making the wall shorter. Maze area size has been downscaled.
Merge branch 'master' of https://github.com/owyoow/Circus-Horror

Conflicts:
	Circus_Horror/Assets/Scenes/Level01.unity
	Circus_Horror/Circus_Horror-csharp.sln
	Circus_Horror/Circus_Horror.sln
fixed the candle
Once again. Small changes. Log Cabin is in the scene with a fire inside. Brought in some particle effects that i will be using later.
candle change