git diff 解決衝突
修改css前
bootstrap2.3 升級到3.2
delete 文件
修改deploy.rb 文件