installed capistrano
merging files from second computer