first commit
second commit
Merge branch 'abishaQl'

Conflicts:
	abisha-abisha/.project
clean up
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql