k
Merge branch 'master' of https://github.com/adimux/hamza-adam

Conflicts:
	jeu.html
lol
Merge branch 'master' of https://github.com/adimux/hamza-adam