添加post 的评论
Merge branch 'master' of https://github.com/zhzenghui/YMM-Site

Conflicts:
	app/controllers/home_controller.rb