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