cleaned up conflict from caytekin
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql