搞定 修改密码 && 退出
Merge branch 'master' of https://github.com/YvonneZhang/jiangcai

Conflicts:
	public/stylesheets/layout.css
Merge branch 'master' of https://github.com/YvonneZhang/jiangcai