Textures fixed at last
Merge branch 'master' of https://github.com/michaelnilsson90/ProjectTNM061

Conflicts:
	.objs/main.o
	OpenGLTest.exe