k
reset
Merge branch 'master' of https://github.com/DtDMRG/classes.git

Conflicts:
	Debug/matarray
	Debug/source/subdir.mk
	source/matarray.cpp
	source/matrixdefs.h
	source/mpo.cpp
	source/mpo.h
	source/mps.cpp
	source/mps.h