Pb with merge
Merge branch 'master' of https://github.com/MatthFleury/WackAMole

Conflicts:
	index.html