add user page edit
resolve bug
resolve conflicts
Merge pull request #24 from deuxio/add_user_page

add user page edit