..
Merge branch 'master' of github.com:saramuel/Dip

Conflicts:
	python/ChiPvalues.py