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