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

Conflicts:
	source/matarray.cpp