Revert "Revert "Merge branch 'master' of https://github.com/thomassenkman/suivezlefil""

This reverts commit f4ee8dbbf6da2dc888b8752cf75cedd84c35d1d7.