Weizmann move
Merge branch 'master' of https://github.com/morganbye/EPRtoolbox

Conflicts:
	HADDOCK/HADDOCK_CLUSTERS_PROCESSING.m
	HADDOCK/HADDOCK_CLUSTERS_TO_PYMOL.m
	MMM_functions/MMMplotter_2SLs.m
	MMM_functions/MMMplotter_3SLs.m
	README.txt
	cw/e2a.m
	misc/BrukerRead.m
	misc/BrukerWrite.m