Minor changes
Changes prescribed by Phillip
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/RufusMbugua/ADT
database