Merge branch 'background' of https://github.com/hurricanerix/sdl2_opengl3 into background

Conflicts:
	Makefile
	src/config.c
	src/main.c
	src/object.c
	src/object.h
	src/shader.c
	src/shader.h
	src/status.c
	src/status.h
	src/texture.c
Merge branch 'master' of https://github.com/hurricanerix/sdl2_opengl3
removed auto rotation
bump mapping appears to be working now.
changed normal