der textures
second
Merge branch 'master' of https://github.com/Ykarion/CSII3-Projet-3D

Conflicts:
	src/World.cpp