Added Room class
Merge branch 'Room'