update
Merge branch 'master2'

* master2:
  update

Conflicts:
	README.md
	index.jade
	package.json
	tasks/reveal.js
deletion