Updating the Makefile to support multiple architectures as well as OpenGL.
Merge branch 'master' into trying_opengl

Conflicts:
	Makefile
	sdl_window