Added the room number field to the model/view
Fixed merge conflicts..yo