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

Conflicts:
	src/Library/Engine.cpp
s
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
ajout des texture allegro et sfml