room renamed and duplicated
Merge branch 'master' of https://github.com/khhle/super-slug

Conflicts:
	fishpod4.gmx/fishpod4.project.gmx
	fishpod4.gmx/rooms/room4.room.gmx