ga
Merge pull request #1 from xcarpentier/gh-pages

merge
Merge pull request #2 from xcarpentier/master

Master