qwe
Merge branch 'master' of github.com:randwsw/asanti

Conflicts:
	css/lightbox.css
Merge branch 'master' of github.com:randwsw/asanti

Conflicts:
	cart.php
	css/shopstyle.css
	item.php