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

Conflicts:
	src/Map.cpp