aa

a
Merge branch 'master' of https://github.com/alexjoverm/Practica-GC-OpenGL

Conflicts:
	CarGL.depend
	CarGL.layout
	Objects.cpp
	Texturas/Thumbs.db
	bin/Release/CarGL.exe
	main.cpp
	obj/Release/Objects.o
	obj/Release/main.o