wip
Merge branch 'master' of github.com:trubachev/sample_app into sign-in-out

Conflicts:
	app/helpers/sessions_helper.rb
	spec/models/user_spec.rb
Finish user edit, update, index, and destroy actions