done
ds store
compress
active admin done
Merge pull request #30 from amontcoudiol/bouton

done
Merge pull request #31 from amontcoudiol/homepagepicture

compress
slider min and max
fb id js change for heroku push
Merge pull request #32 from amontcoudiol/active-admin

active admin done
Merge pull request #33 from amontcoudiol/slider

slider min and max
conflicts solved