added files to be excluded
merged conflicts
Merge branch 'development' of https://github.com/BaobabHealthTrust/module_hypertension into development
Merge branch 'development' of https://github.com/BaobabHealthTrust/module_hypertension into development
worked on vitals encounter and social history encounter
Merge branch 'development' of https://github.com/BaobabHealthTrust/module_hypertension into development
merged changes
worked on vitals encounter and social history
merged conflicts
removed fixed patient object for encounters