merge from hakimel/reveal.js

merge from hakimel/reveal.js