presentation and code
Merge branch 'master' of github.com:Lakret/kampus-ekb-2014-03 into patch-1