Mis changes
Merge branch 'master' of https://github.com/KrzysztofWrobel/MasterThesis

Conflicts:
	7/evaluation.tex
Resolved