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

Conflicts:
	application/controllers/login_c.php
	application/controllers/member_c.php
	application/controllers/payment_c.php
	application/controllers/product_c.php
	application/views/.DS_Store
	application/views/paymentForm.html
	application/views/product.html
	application/views/productDesc.html
	application/views/signin.html