Merged the Abstract and Concrete Classes

Rewrote the models for Resident and Room to remove the abstract class version.