Changes
Merge branch 'master' of https://github.com/Mureithi/HCMP

Conflicts:
	application/controllers/report_management.php

Merged
1
Merge branch 'master' of https://github.com/Mureithi/HCMP

Conflicts:
	application/views/template.php
new logout log in
.
Merge branch 'master' of https://github.com/RiscaJack/HCMP