add edit page
Merge branch 'master' into useredit
Merge pull request #16 from ricarora/useredit

add edit page