added edit user form
Merge branch 'master' into style
Merge pull request #66 from bchiatt/style

Style