Matrix.cpp and .h
Merge remote-tracking branch 'origin/tianyi2' into luhui
fix bug in Matrix.cpp