working on capistrano
cap 3 work
cap 3 merge