Holala canvas qui se resize
Holala les sinus la folie les mathématiques
Merge branch 'master' into greg
POL ARRETE DE TOUS CASSER
Merge branch 'greg' of https://github.com/TagliatL/Drop-it-Like-it-s-hot into greg
POL ARRETE DE TOUS CASSER LES REPO
Merge branch 'Pol'

Conflicts:
	index.html

allez je comprends pas mais on tente yolo
les buildings woah
Holala elle avance