Merge branch 'master' of https://github.com/nicolasrabier/dius_tennis

Conflicts:
README.md