inheritence dance
Merge branch 'master' of https://github.com/dwagner4/proj-seed