user
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
before
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
reports
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/models/facilities.php
	system/libraries/Hcmp_functions.php
merge
Fixed Error
Merge with Mureithi Live
FInal Notifications
before Merge with Mureithi
Merge with Mureithi demo
Final reports
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:

	system/libraries/Hcmp_functions.php