3.2 -> 4.0
3.2 -> 4.0

Conflicts:
	.DS_Store
	Gemfile
	Gemfile.lock
	config/environments/test.rb
	config/initializers/wrap_parameters.rb
jhfhj