celery
minor
Merge branch 'master' of https://github.com/longfei-wang/mightyscreen

Conflicts:
	main/templates/main/index.html
	main/views.py
	mightyscreen/settings.py
	mightyscreen/urls.py