solution
Merge branch 'master' of github.com:georgemayer/rails_assessment