Ending Gameplay Done
Merge branch 'master' of https://github.com/trikeman/IntermediateGame

Conflicts:
	ProjectEcco/Assembly-CSharp.pidb
	ProjectEcco/Assets/Scenes/UnderTheBed.unity
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectEcco/Library/assetDatabase3
	ProjectEcco/Library/guidmapper
	ProjectEcco/Library/metadata/2c/2ceadc64287b0491a93137928f66566e
	ProjectEcco/ProjectEcco-csharp.sln
	ProjectEcco/ProjectEcco.sln
	ProjectEcco/ProjectEcco.userprefs