Fixed seg fault
Merge branch 'master' of https://github.com/EdsterG/MeshingItUp
Fixed uniformSampling and implemented display modes
Merge branch 'master' of https://github.com/EdsterG/MeshingItUp

Conflicts:
	src/main.cpp
Updated Makefile
Can load and display OBJ files