edit_profile works
fixed up edit_profile, put together instructor dashboard, grading and design, e-mail registration
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/templates/base.html
	student_portal/forms.py
	student_portal/views.py