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

Conflicts:
	delete-comment.php
	product.php
	styles/main.css