Merge branch 'master' of https://github.com/faitmain/faitmain.org
Merge remote-tracking branch 'upstream/master'
Typos
typos
typos
formulation
typo
Merge pull request #114 from fgibaux/master

typos