Merge pull request #1 from serut/master

maj 14
Merge branch 'master' of https://github.com/serut/philippe
Merge branch 'master' of https://github.com/superkebab/philippe