Finished evaluation
Work in progress
Merge branch 'master' of https://github.com/fikovnik/ttc14-fixml-sigma

Conflicts:
	doc/Evaluation.tex
	doc/references.bib