Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
first commit
initial commit
hcmp live set up
fix
fix
fix
fixing query
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
changing db name
merging with collins
quick fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	.gitignore
	.htaccess
	application/config/config.php
	application/config/database.php fixed
	application/controllers/home.php
	application/controllers/issues.php
	application/controllers/national.php
	application/controllers/stock.php
	application/controllers/user.php
	application/models/commodities.php
	application/models/facilities.php
	application/views/Admin/users_v.php
	application/views/facility/facility_issues/facility_issues_service_points_v.php
	application/views/facility/facility_orders/facility_order_from_kemsa_v.php
	application/views/facility/facility_stock_data/update_facility_stock_on_first_run_v.php
	application/views/national/national_home_v.php
	application/views/shared_files/activation.php
	application/views/shared_files/login_pages/forgotpassword_v.php
	application/views/shared_files/login_pages/login_v.php
	system/libraries/Hcmp_functions.php
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	.gitignore 3
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/config/database.php
fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live

Conflicts:
	.htaccess
	application/controllers/user.php
check
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	.gitignore
	application/config/database.php