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

Conflicts:
	paper/tacas14/formalism.tex
	paper/tacas14/merging.tex