Merge branch 'master' of /Users/lucas/Documents/Github/Bluedashed with conflicts.
Merge remote-tracking branch 'origin/master'
changeage des fleches du slideshow