tweek
from linux
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fix
fix
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
test
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/config/config.php
	application/controllers/national.php
	application/controllers/user.php
	application/views/Admin/users_v.php fixed
	application/views/national/national_home_v.php
	system/libraries/Hcmp_functions.php