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

Conflicts:
	css/shopstyle.css
	img/boy.png
	img/girl.png
	include/submenu.php
	shop.php