added room with area and cost functions
Merge branch 'dev'