Fixed Errors
Merge branch 'rohini'

Conflicts:
	mooc/mooc-ws/classroom.pyc
	mooc/mooc-ws/data/storage.pyc
Adding .pyc to gitignore