First test rails commit
Merge branch 'master' of github.com:robbintt/rails_test