Added dorm object variables.
-Smita Patankar
Fixed conflict.