Refactored a little, fixed bugs in grammar, check for duplicate variable
inserted
added if and else objects
Merge branch 'master' of github.com:software-engineering-amsterdam/poly-ql