dashboards 1
load
new changes
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/controllers/home.php
	application/views/shared_files/template/template.php
New Thur 20th
sublime git test
css new
111111
auto log out
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/views/shared_files/commodities/commodity_list_v.php fixed
merge
new merge
sublime
sublime2
commit
new changes 123
123
all new
merge with master
3:58