Commiting local changes
Merge remote-tracking branch 'upstream/master'
Completing merge with udamacmini
Testing Capistrano