maj de l'algo
Merge branch 'master' of https://github.com/debflav/mars

Conflicts:
	assets/js/canvas.js