phpexcel
deleted excel
Test commit to new live
program commodities
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
Working Live order
Order - Live
batch files
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
Commodities Table
Order
National Dashboard changes
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
Changes to the dashboard and county view
git ignore
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Conflicts:
	application/models/facility_stocks.php
Removed Table Data and Download buttons
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
National Dashboard Search update