fixes to hash merge
Merge branch 'master' of https://github.com/berrberr/course-parser