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

Conflicts:
	css/shopstyle.css
	shop.php