Merge pull request #42 from benichu/master

Website translated in french, with all upstream conflicts resolved.