Updates
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	CSS/style.css
	application/controllers/regimen_management.php
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

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

Conflicts:
	application/controllers/user_management.php