fixing errors
Merge branch 'master' of https://github.com/jennyallen/rails-project