changes to mesh
Merge branch 'master' of https://github.com/oscmejia/ps4

Conflicts:
	test_mesh.cpp
fixed merge conflicts
updated mesh.cpp to fix compile errors with test_mesh