New content and tweaks to rooms
Merge branch 'master' of https://github.com/geldshot/House-of-Emoji

Conflicts:
	Assets/test.unity