Reworked the shape classes and added SphereShape
Merge branch 'master' of https://github.com/Tomius/oglwrap

Conflicts:
	general.h