Permalink
Browse files

merge conflicts

  • Loading branch information...
2 parents 7e1d714 + 523b451 commit 5a7470e562dc325b3bcc875010b805cb231c6f2d @andymboyle committed Oct 12, 2013
Showing with 6 additions and 0 deletions.
  1. +6 −0 README.md
View
@@ -0,0 +1,6 @@
+spj-tabletop
+============
+
+A quick demo on how to use tabletop.js for a SPJ talk. The index.html shows how to display information as just text, as if it were a story.
+
+The tables.html shows how to display the same information in a table.

0 comments on commit 5a7470e

Please sign in to comment.