fixed most skybox errors
Merge branch 'Emmabranch' of https://github.com/mpmitchell/bearded-tyrion into Emmabranch

Conflicts:
	library/include/shader.h
	library/include/texture.h
	library/library.vcxproj
	library/src/shader.cpp