change model
Merge branch 'master' of github.com:kwerenda/paragonizator
user operations on database
Merge branch 'master' of github.com:kwerenda/paragonizator
update .gitignore
Merge branch 'master' of github.com:kwerenda/paragonizator

Conflicts:
	server/resources/Shopping.py

add name and location of shop loading