Merge branch 'master' of https://github.com/jsnr/yir

Conflicts:
	index.html