asuka:comment_k+1
Merge branch 'master' of https://github.com/xiaohuajiao123/class_site

Conflicts:
	class_site/settings.pyc
	class_site/views.py