second commit today
edit
Final change in section 2
Merge branch 'develop' of https://github.com/johnotaalo/mnh into develop

Conflicts:
	application/core/MY_Controller.php
	application/models/Entities/models/Entities/AssessorInformation.php
	application/models/Entities/models/Entities/HrInformation.php
	application/models/Entities/models/Entities/LogTreatmentmalnpne.php
	application/models/Entities/models/Entities/LogUsageStockOut.php
	application/models/Entities/models/Entities/Stock.php
	application/models/Entities/models/Entities/Test.php
	application/models/Entities/models/Entities/Treatments.php~a4a6ffefd9f5d8691f583965a5fb48b280011ed3
	css/style.css
Routine Changes
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop
Added Tabbed Map
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop

Conflicts:
	application/core/MY_Controller.php