Git test k
git test g
Merge branch 'master' of https://github.com/glaizer/CD4

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

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