changes i did like 6 hours ago that never got added?
Merge branch 'master' of github.com:BLNorris/project-rails