Inventory and patient
ADT
Last Commit
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
	application/controllers/patient_management.php