no message
Merge branch 'master' of https://github.com/pun2345/Dumbobay

Conflicts:
	application/controllers/home_c.php
	application/controllers/login_c.php
no message
no message
Merge branch 'master' of https://github.com/pun2345/Dumbobay

Conflicts:
	application/controllers/cart_c.php
	application/controllers/member_c.php
	application/controllers/payment_c.php
	application/views/index.html