Added images to most of the rooms.
Fix merge conflict.