Added the remaining Models as well as SampleData.cs for testing
Additional files necessary for the database
Fixing merge conflicts
Touching up the SampleData files