setting
Merge branch 'master' of https://github.com/konglingkai/Projects

Conflicts:
	maimaiti/maimaiti/settings.py
Merge branch 'master' of https://github.com/konglingkai/Projects
 urls.py
list
views
Merge branch 'master' of https://github.com/konglingkai/Projects