changes
Merge branch 'master' of https://github.com/sakshi1107/mooclms

Conflicts:
	docs/build/html/objects.inv