make primitive test
Merge branch 'master' of https://github.com/mash-it/CafeMolAnalysis

Conflicts:
	bin/contactmap.py
	check.sh
contactmap dmat not required output file