ficsh quest 2
Merge branch 'master' of https://github.com/Vodkamalabar/projet-jdr

Conflicts:
	quete2/bite.c
	quete2/doom.c
	quete2/earthquake.c