as;ldkfjsad;lkfj
a;sdlkfjas;dlkfjMerge branch 'master' of
https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc_database.db
asdklfjsad;klfjMerge branch 'master' of
https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc_database.db
um what
Merge branch 'master' of https://github.com/mtarsel/dream-girlz
added the models for lectures and added an example to add video lectures
to the courses