gitignore updated
Merge branch 'master' of github.com:eddieberklee/rails-10000