Had some idea to work on
Merge branch 'master' of github.com:cbaggers/cepl

Conflicts:
	cgl/shaders.lisp
Screwed up a merge so fixing now