truc
Merge branch 'master' of https://github.com/enzoramos/Catch-The-Damn-Cat

Conflicts:
	src/fr/upem/catchTheDamnCat/Window.java