added the feature for staff to edit patients
fixed merge conflict
Merge branch 'master' of https://github.com/davidjeong/ece356