support for Capistrano
Merge branch 'master' of github.com:giozhou-p/bangni
resolve conflict manually