first cut
Merge branch 'master' of github.com:adamneilson/clj-keynote

Conflicts:
	.gitignore
	README.md