Bug finding
Finish user edit, update, index, and destroy actions
Merge branch 'master' of github.com:pvcarrera/sample_app

Conflicts:
Merge branch 'updating-users'

Conflicts:
	spec/spec_helper.rb