61c229a4f9
Conflicts: README.md index.html js/reveal.js package.json plugin/speakernotes/client.js
Conflicts: README.md index.html js/reveal.js package.json plugin/speakernotes/client.js