test
Merge branch 'master' of https://github.com/danielstorch/shop-repo.git

Conflicts:
	shop/src/main/resources/sql/create.sql