Update: git from git to https
add .capistrano to .gitignore
Merge branch 'yang' into dev