changes after demo
Merge branch 'duplicate_handling' of https://github.com/BaobabHealthTrust/OPD into duplicate_handling
Merge branch 'prescription' of https://github.com/BaobabHealthTrust/OPD into prescription
Merge branch 'prescription' of https://github.com/BaobabHealthTrust/OPD into prescription
column prescription interface
merge conflicts
merge conflicts
merge conflicts
merge conflicts