Initial stab on GLFW version...pretty broken and in the wrong branch
Merge branch 'master' of https://github.com/AdamSimpson/PiBrot

Conflicts:
	multi_tex.c
	pibrot.c