Initial Commit
Merge branches 'master' and 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
Pipeline Upload
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	CSS/style.css
	Scripts/offline_database.js
	application/controllers/facilitydashboard_management.php
	application/views/home_v.php
	application/views/template.php
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	.project
	CSS/offline_css.css
	Scripts/offline_database.js
	application/controllers/facilityadmin_dashboard_management.php
	application/controllers/user_management.php
	application/views/drug_below_safety_v.php
	application/views/template.php
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	CSS/style.css
	application/controllers/facilityadmin_dashboard_management.php
	application/views/template.php
Edits