modify gemfile and application.rb
prepare for merge
Merge branch 'chapter3'