Changes to predicates
Added GSLocate
t
Merge branch 'master' of https://github.com/COMP651-S14/TerrainMesh

Conflicts:
	include/predicates.h