test debug
caorection du segafault sur le quit
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
ajout de collide
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
ca marcge
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf

Conflicts:
	ressource/map/map-1.conf
	src/Map.cpp