v
Merge branch 'master' of https://github.com/starkshadow/duck-city

Conflicts:
	views/products/shop.php