no message
Merge branch 'master' of https://github.com/Soamid/dronka-shop

Conflicts:
	src/pl/edu/agh/dronka/shop/view/ShopFrame.java