added ability for patient to modify his/her own information
minor bug fix
resolved merge conflict
Merge branch 'master' of https://github.com/davidjeong/ece356