didnt want to stash
Merge branch 'master' of https://github.com/stevenblaster/craplib

Conflicts:
	data/shader/crap_shader.frag
	data/shader/crap_shader.vert
	source/SPG/main.cpp
Merge branch 'master' of https://github.com/stevenblaster/craplib
shader fixes, running with 3 lights