Lopullinen dokkari
Merge branch 'master' of https://github.com/putsi/hairy-bugfixes

Conflicts:
	fatbegone2013_seminar.pptx