Français
Merge branch 'gh-pages'

Conflicts:
	fr/index.html