2nd puzzle room.

Reworked the early rooms.
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Conflicts:
	tojam/Assets/Textures/required_goatonapole.png.meta
Add collision to hallway thing