0
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/views/shared_files/template/template.php u
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/views/shared_files/template/template.php
new changes
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/controllers/home.php
	application/views/shared_files/template/template.php