Update file 1
Merge branch 'develop' of github.com:epodczaszy-silicon/GitPlayground into new_cart_checkout

Conflicts:
	file1