Git test k
Git test R
Merge branch 'master' of https://github.com/mtesigwa/CD4

Conflicts:
	application/modules/test/controllers/test.php
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	application/modules/test/controllers/test.php