drastic changes
added sample data to database. Created schema file. Fixed imports
fixed merge conflict