finished model
fixing merge conflicts
Merge branch 'master' of github.com:estreske/CRUD_group