intermediate save
save canges
Finish user edit, update, index, and destroy actions
Merge branch 'master' of https://github.com/jtmurphree/sample_app

Conflicts:
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/helpers/users_helper.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/sessions/new.html.erb
	db/schema.rb
	spec/models/user_spec.rb
	spec/requests/authentication_pages_spec.rb
	spec/requests/user_pages_spec.rb