remove ads
Merge branch 'master' of github.com:congyuandong/train

Conflicts:
	templets/default/article_article.htm
error