images et stylesheet
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /Users/mlitalien/Desktop/MinuitCinq_WD/20087_fungo_groupe/fungo-rails with conflicts.
images et stylesheet