commit before merge
Merge branch 'master' into model
remade schema and migrations.  associations are functional.
Merge branch 'model'