Syncing
Merge remote-tracking branch 'origin/master'

Conflicts:
Merge pull request #4 from maximeHourtane/master

pull