Added room objects and modified room class to include name property