added to the doctor
fixed merge conflicts
Merge branch 'master' of https://github.com/irenemrisho/UDIHIS