Merge branch 'add-travisci' of https://github.com/nschonni/reveal.js
authorhakimel <hakim.elhattab@gmail.com>
Mon, 21 Jan 2013 21:07:37 +0000 (16:07 -0500)
committerhakimel <hakim.elhattab@gmail.com>
Mon, 21 Jan 2013 21:07:37 +0000 (16:07 -0500)
1  2 
README.md

diff --cc README.md
Simple merge