Fixed Bugs
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/controllers/facilityadmin_dashboard_management.php
	application/controllers/patient_management.php
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/add_patient_v.php
	application/views/template.php
Minor changes
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Fixed
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
	application/controllers/facilitydashboard_management.php
	application/views/sections/head.php
Reconfig
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/controllers/patient_management.php
	application/views/sections/head.php
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
Report Changes
Minor Changes
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/template.php
Invenoty updates