Wip
Merge branch 'master' of github.com:curlycurlette/dbproject
repull for fixing
query A (back)