Change directories, uploading files
Merge branch 'master' of https://github.com/michaelsouza/preconditioners

Conflicts:
	approx_inverse/@precond/bcj.m
	approx_inverse/@precond/fsai.m
	approx_inverse/@precond/mr_a.m
	approx_inverse/@precond/mr_dp.m
	approx_inverse/@precond/mr_s.m
	approx_inverse/@precond/precond.m
	approx_inverse/@precond/spai_a.m
	approx_inverse/@precond/spai_s.m
	approx_inverse/analysis.m
	approx_inverse/interface_spai_a.m
	approx_inverse/make_matrix.m
	approx_inverse/matrices/bcsstk01.mtx
	approx_inverse/matrices/bcsstk19.mtx
	approx_inverse/matrices/memplus.mtx
	approx_inverse/matrices/mmread.m
	approx_inverse/matrices/saylr1.mtx
	approx_inverse/plot_eig.m
	approx_inverse/solver.m
	approx_inverse/sparse_laplacian.m