Client can edit info
Merge branch 'master' of github.com:PatoBeltran/AMSSProject