matrix class nearly up. need a row class. going for class now :P
Merge remote-tracking branch 'origin/master'