Merge branch 'update-readme' of https://github.com/aethanyc/reveal.js into dev
authorHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 22 Oct 2013 12:39:27 +0000 (08:39 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 22 Oct 2013 12:39:27 +0000 (08:39 -0400)
1  2 
README.md
js/reveal.js

diff --cc README.md
Simple merge
diff --cc js/reveal.js
Simple merge