add capistrano 3
finialize capistrano
merge confilict with layout/application.html.haml