康威生命游戏
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/article.py