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

Conflicts:
	shop.php
wszystko
sam nie wiem
LItwo
Merge branch 'master' of github.com:randwsw/asanti
i.name