Adding-removing headers and such.
Merge branch 'master' of https://github.com/2-complex/g2c

Conflicts:
	examples/sprite.cpp
	examples/triangle.cpp