correct
correted
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/simulatorCore/src/objLoader.cpp