result commit
Merge branch 'master' of https://github.com/spectrec/db_course_project