Set up prettyprint
Merge branch 'master' into gh-pages

Conflicts:
	demo/demo.min.css
	index.html