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

Conflicts:
	cart.php
asd