Changed stuff according to Tijs' comments and added GUI stuff
Merge branch 'master' of github.com:software-engineering-amsterdam/poly-ql