fixed zip_course bug
Merge remote-tracking branch 'sean/master' into sean_update
Merge remote-tracking branch 'upstream/master'