comit
Final
textures
final2
others textures
Merge branch 'Final'

Conflicts:
	Building.cpp
	Building.h
	CameraSpectator.cpp
	CameraSpectator.h
	Main.cpp
	Map.h
	SkyCube.cpp
	Texture.cpp
	Win.cpp