Merging.
Merge branch 'master' of https://github.com/wallacet/HorrorWonderLand-GJ-11-14

Conflicts:
	Assets/scene2.unity