config
Merge branch 'develop' of https://github.com/RufusMbugua/essential
Merge branch 'develop' of https://github.com/RufusMbugua/essential into develop

Conflicts:
	application/config/config.php
Merge branch 'develop' of https://github.com/RufusMbugua/essential into develop
Megrge
Merge branch 'develop' of https://github.com/RufusMbugua/essential into develop
Merge branch 'mnch' of https://github.com/RufusMbugua/essential into mnch
getting started
getting started
Mine now working
Did some supplier location but without statistics
Merge branch 'hotfix/3.9.54.2'
Merge branch 'release/3.9.55'
Merge branch 'mnch' into develop
Merge branch 'release/3.9.55.1'
Fixed Colors for Equipment
Merge branch 'hotfix/3.9.55.2'
Merge branch 'hotfix/3.9.55.2' into develop
Merge branch 'develop' into mnch
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch