I don't know
Merge branch 'lighting' of https://github.com/kwmichaelluk/project479 into lighting

Conflicts:
	common/TextureFragmentShader.fragmentshader
	common/TransformVertexShader.vertexshader
	common/load_compute_shader.cpp
	common/load_compute_shader.hpp
	common/load_render_shaders.cpp
	common/load_render_shaders.hpp
	common/objloader.cpp
	common/objloader.hpp
	common/sphere.bmp
	common/sphere.mtl
	common/sphere.obj
	common/texture.cpp
	common/texture.hpp
	src/glfw_test.cpp