Dummy
Merge branch 'master' of https://github.com/COMP651-S14/TerrainMesh

Conflicts:
	include/triangulation.h
	include/vec3.h