ça affiche des trucs
Merge branch 'master' of https://github.com/Poltuu/Grumble

Conflicts:
	popup.html