a;flkjasd;flkj
dklsjf;asldkja;ksdlfjsa;dlkfjs;adlkfjMerge branch 'master' of
https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/settings.py
added the documentation