tmp_changes
form changes
form changes_1
Merge branch 'sign_up_form_changes'

Conflicts:
	config/initializers/simple_form.rb
sign_in_form_change
	deleted:    config/initializers/simple_form.rb