Fallo de github.
Merge branch 'master' of https://github.com/alfreSosa/Programacion2D
Error en sesion github
Conflicts:
	Motor2D/lib/stb_image.h
	Motor2D/main.cpp
	Motor2D/src/image.cpp
	Motor2D/src/renderer.cpp
	Motor2D/src/screen.cpp
	Motor2D/u-gine.vcxproj
	Motor2D/u-gine.vcxproj.filters