Added update and edit to user
Added views for edit and show, update and edit works
Merge branch 'master' of github.com:jsh0rty/emeriti-client

Conflicts:
	routes/user.js