removing conflicting objects
more merge conflicts
pushing database generator
Merge branch 'master' of https://github.com/jenwei/OlinCourseAnalytics