refactor
Merge branch 'master' of github.com:cwi-swat/textual-model-diff

Conflicts:
	src/TheDiff.rsc
Merge
Adding Operations
Misc