Merge branch 'master' of https://github.com/MatthewEppelsheimer/reveal.js into dev
authorHakim El Hattab <hakim.elhattab@gmail.com>
Mon, 22 Jul 2013 12:47:54 +0000 (08:47 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Mon, 22 Jul 2013 12:47:54 +0000 (08:47 -0400)

Trivial merge