Rebase
Change password design
Change password
Restructure of views
 -> Merged JS
 -> Merged CSS
Unifying Styling
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	CSS/style.css
	application/controllers/facilityadmin_dashboard_management.php
	application/views/template.php
Edits
Updates
Change of h3 Color to blue
Re-ordering Template
Minor edits
changes
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	application/controllers/facilityadmin_dashboard_management.php
	application/views/login_v.php
	application/views/template.php
	application/views/template_admin.php
Fixed bugs
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