massa
Merge branch 'master' of https://github.com/Cadynum/kandidat

Conflicts:
	presentation/slides.tex