Merge branch 'master' of github.com:hakimel/reveal.js

Conflicts:
	Gruntfile.js