bug fix
Merge branch 'gh-pages' of https://github.com/fred3m/toyz into gh-pages

Conflicts:
	.nojekyll