Set up database and models
Merge branch 'master' into database_setup
Merge pull request #2 from tarynsauer/database_setup

Database setup