Update development.rb
Merge branch 'remove_file'

Conflicts:
	config/environments/development.rb

commit