ssl
nascop url
Merge branch 'master' of https://github.com/jgat2012/ADT
database
edit patient and details
Clean up
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	assets/cache/137699369972036eaa66b8a0fc4c07e1545589c5be.css
	assets/cache/13776143217b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13824227307b0bbd27a4acf15a38e2865ca72cbe4f.css
Update My_Formatter.php

Test Update
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/edit_patients_v.php
filter
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Fixed Github Updater
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Backup
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Database
git Sync
git and add patient
edit patient
ssl