user can edit name
user can edit name
Merge branch 'Jon' of https://github.com/noj33/JAB_project into Jon