fixed test 'block'.Fixed - finished grammar (I guess)
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql

Sync local with remote.