added a user/edit route
Merge branch 'master' of https://github.com/stevekane/videosite