ca marche !!!!
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf

Conflicts:
	inc/Map.hh
	src/Library/Engine.cpp