Refactoring with AutoMapper
resolving merge conflicts
merging in Matt's changes and altering code to allow personal page to display data correctly
committing changes before I undo a bunch of stuff
Merging of household and personal data onto one tab.  Saving updates to info