Rien
Trois modèles
Conflict
Revert "Conflict"

This reverts commit f5c3f597948af914c0c21b4b71f611c3e5f505eb.
Revert "Trois modèles"

This reverts commit 41d87d87c1f951f9d4964d50c52558864e7f09a5.
Revert "Rien"

This reverts commit 1988960f5f3f4423843210cbb1fcd49c26038567.
Merge branch 'master' of https://github.com/JackPotte/JackBot