Can't fight with git, so commit it is.
Merge branch 'master' of github.com:ska-sa/corr

Conflicts:
	src/corr_functions.py