fixing cmake
Merge branch 'master' of https://github.com/COMP651-S14/TerrainMesh
Merge branch 'master' of https://github.com/COMP651-S14/TerrainMesh
added stream operator to main
Merge branch 'master' of github.com:COMP651-S14/TerrainMesh
Merge branch 'master' of github.com:COMP651-S14/TerrainMesh