needed to compile changes
Merge branch 'master' of https://github.com/engineerOfLies/EngineOfLies

Conflicts:
	include/Makefile
	include/eol_opengl.h