modified development.rb
Merging changes