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