Gemfile
Merge branch 'master' of github.com:chrisdfe/projector
Merge from master
merge from origin/master