Settings updates
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
settings updates
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/views/template.php
Reports
Merged with Marete
Style changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Indications
Merge branch 'master' of https://github.com/RufusMbugua/ADT