done a shitload of shit
Merge branch 'master' of github.com:darthduval/opengl