Finished abstract_matrix_factory
Finished sparse_matrix_factory
Merging with master
trying to merge master