Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add links to slides
also add html files from media
Merge pull request #531 from garrigue/master

Add slides for OCaml 2014