modified benchmark/frank_matrix.cpp to use timer class
Merge remote-tracking branch 'origin/develop' into develop