Merge branch 'master' of goat:git/laserbrain_demo
[laserbrain_demo] / src / object.cc
2016-10-29 John Tsiombikasassimp