Commited changes at line:145
Changes made at line: 145
Merge branch 'master' of https://github.com/mitsupport/ocw2edx

Conflicts:
	scholar2xbundle.py