Merge branch 'master' of /Users/guillaumekoehrlen/Documents/web/webProjet with conflicts.
Revert 7197d17..e9e5a9d

This rolls back to commit 7197d1742720ac58c1171df12d71c43d92b1d0dc.