error happen
Merge branch 'master' of https://github.com/gabrieltong/rails-baocheng

Conflicts:
	db/schema.rb
修改health_check