migrations and model complete
Merge branch 'database_setup'