Added makeRooms() to make class/interface
Merge branch 'dev'