Switched back to sqlite3. Some minor formatting changes. Cannot view class page
Switched back to postresql
Fixed newine issue
Merge branch 'master' of https://github.com/mtarsel/dream-girlz
Merge branch 'master' of https://github.com/mtarsel/dream-girlz
Merge branch 'master' of https://github.com/mtarsel/dream-girlz
Working on instructor dashboard to create a course. Cannot import username into form
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/templates/base.html
	mooc/templates/courses.html
	mooc/templates/instructor_portal/dashboard.html
Instructor can create a new course from dashboard
Added new assignment form, not tested.
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	instructor_portal/urls.py
	instructor_portal/views.py
Removed bad courses link and fixed dashboard list for teaching courses
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	instructor_portal/urls.py
Testing new ass. in course dashboard. Issue with modelform and foreignkey to course
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	instructor_portal/views.py
Can create assignment in instructor dashboard
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	instructor_portal/views.py
	mooc/templates/course_info.html
	mooc/templates/instructor_portal/course_dashboard.html
Added new lecture. Not tested
Added links to new lecture
Added <br> to seperate links