Pages commit
Merge branch 'gh-pages' of https://github.com/scriptist/Cinnamon.js into gh-pages

Conflicts:
	index.html