local
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/templates/base.html
	mooc/urls.py
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/urls.py
added mooc/media/uploads so the filebrowser works
added mooc/media/uploads so the filebrowser works
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc/urls.py
	mooc_data.db