Test
Merge branch 'master' of https://github.com/Copainbig/projetJS

Conflicts:
	script.js