+ some minor updates (from training)
Merge branch 'master' of https://github.com/arnosthavelka/presentation