minor changes
Merge branch 'master' of https://github.com/tillrohrmann/masterthesis

Conflicts:
	gilbert/06_gilbert_runtime.tex
	gilbert/gilbert.sublime-workspace