Made Changes to Models
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/settings.py
Got Instructor Dashboard rendering
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/templates/lecture.html
	student_portal/views.py