the whole family model
Merge pull request #15 from loganwatanabe/master

the whole family model
Merge remote-tracking branch 'upstream/master' into egan-dev
merges for the whole family model