as of 23
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Conflicts:
	application/controllers/reports.php
	application/models/facilities.php
	application/models/facility_stocks.php
Merge branch 'master' of https://github.com/Mureithi/HCMP-1

Conflicts:
	.gitignore
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facilities.php
	application/models/facility_stocks.php
Before Merge with Adima
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Conflicts:
	.gitignore
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facilities.php
	application/models/facility_stocks.php
Consumption Graph
Merge branch 'master' of https://github.com/Mureithi/HCMP-1

Conflicts:
	.gitignore
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facilities.php
Merged with Mureithi