SQL please
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/kosakorner/openshop/OpenShop.java
SQL please/command stuff