homework
Merge branch 'master' of https://github.com/myu/Ceramics

Conflicts:
	application/controllers/home.php
	application/models/product_model.php