clear cache
merge readme updates into HEAD
Merge branch 'master' of https://github.com/carolineartz/rails-scaffolding-example-ref