migrate
yeye:Merge branch 'master' of https://github.com/tutoriumuk/tutorium

Conflicts:
	__init__.pyc
	settings.py
	settings.pyc
	urls.py
	urls.pyc