user edit page works
user edit form has errors (the good kind)
fixed merge conflict in routes.rb
Merge branch 'usersedit'