b
Merge branch 'master' of https://github.com/qasim/uoft-course-api

Conflicts:
	routes/courses.js