sometimes it's really stupid
Merge remote-tracking branch 'origin/master'

Conflicts:
	degreemap_app/models/Course_model.php