save
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-contents

Conflicts:
	.gitignore
	logs/app.log
	logs/django.log
增加点赞功能