commit
Merge branch 'master' of https://github.com/grudy/m1ri

Conflicts:
	m1ri/m1ri_classical.h
local
del
Fix from cherry picking