subime
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	cd4.sublime-workspace
sublime workspace
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	cd4.sublime-workspace
merge
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	cd4.sublime-workspace
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4

Conflicts:
	application/modules/poc/controllers/uploads.xlsx
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/glaizer/CD4
Merge branch 'master' of https://github.com/glaizer/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4
Merge branch 'master' of https://github.com/MwangiKevin/CD4