damn...
Merge branch 'master' of https://github.com/stevenblaster/craplib

Conflicts:
	source/SPG/main.cpp