removed a constructor from ofxVideoPlayerObject.h
fixed merge problems
removed more git markup
merged with master
silly whitespace merge with ofxText, modified destructor of ofxTextureObject.cpp
ofxObject: added auto removeChild to destructor
Merge branch 'master' of github.com:sosolimited/ofxSoso
Pulling newest changes after word color alpha fix
Merge branch 'master' of github.com:sosolimited/ofxSoso
slight updates to obj/text/letterText for parallel functionality
Merge branch 'master' of github.com:sosolimited/ofxSoso
Merge branch 'master' of github.com:sosolimited/ofxSoso