merge code.gangneux.net to jerome.gangneux.net
Merge branch 'gh-pages' of github.com:gigigan/jerome.gangneux.net into gh-pages

Conflicts:
	index.html