Modified merging
Merge branch 'master' of https://github.com/aleksandarmilicevic/slang

Conflicts:
	paper/tacas14/formalism.tex