Fix up compilation with KGLT
Merge branch 'master' of github.com:Kazade/Spindash

Conflicts:
	tests/main.cpp