add capistrano files
merge conflict