format code
Merge branch 'master' of https://github.com/lantianlz/gzc

Conflicts:
	www/question/views.py