changes
Merge branch 'rails_forms' of github.com:smarquez1/form_app into rails_forms

Conflicts:
	app/views/forms/steps/_step2.html.haml
changes