Cart_con + model
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/views/header.php
Merge branch 'master' of https://github.com/zentojamorn/kafra