Added capistrano to the git ignore file
Merge remote-tracking branch 'origin/master' into release