Add configuration
Merge branch 'master' of https://github.com/tonesofheresy/learn-rails