add configuration
add configuration
Merge branch 'master' of https://github.com/frycek/learn-rails