.
Merge branch 'master' of https://github.com/Spleeen/Reconnaissance-de-caract-res

Conflicts:
	src/main.cpp