Merge branch 'master' of https://github.com/tharvik/COG

Conflicts:
	Mesh.h
Nothing