Added the ability to add a new user
Merge branch 'addEdit'