zmiany
Merge branch 'master' of https://github.com/kpiszczek/ubershop

Conflicts:
	ubershop/urls.pyc