Merge pull request #1 from xeno-by/master

ScalaDays2014
link to the slides
Merge pull request #2 from xeno-by/master

link to the slides
typo