Transforming from just SQL-like queries to create framework for complex queries
Merge branch 'master' of https://github.com/Staix34/DBWS