phpexcel
deleted excel
Working Live order
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live

Conflicts:
	application/views/facility/facility_orders/facility_order_from_kemsa_v.php
	print_docs/excel/excel_files/Githiga Private Medical Clinic_facility_order_no_192_date_created_05-09-14.xls
ignore
Bulk commit
Rtk dashboard
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Changes to RTK Part
Merge branch 'master' of https://github.com/Mureithi/HCMPv2_live

Conflicts:
	.gitignore
	application/controllers/orders.php
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facility_stocks.php
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/controllers/reports.php
	application/models/facilities.php
	application/models/facility_stocks.php
Fixed Expiries
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