Merge branch 'master' into guillaume
Merge branch 'master' into guillaume
Merge branch 'master' of https://github.com/westerly/tuc into guillaume
Modifs controller defis pour envoyer que les photos affichables
Merge pull request #6 from westerly/guillaume

Guillaume