Temp commit.
Merge branch 'master' of github.com:yuwilbur/3DViz

Conflicts:
	3DViz/src/testApp.cpp
	3DViz/src/testApp.h