...
Merge branch 'master' of https://github.com/wesny11/NihonByTheWay

Conflicts:
	basket.php
	index.php
	product.php