Merge branch 'master' of
https://github.com/leecarraher/CardinalityShiftClustering

Conflicts:
	README.md
git and eclipse git are fighting:c
Merge branch 'master' of https://github.com/leecarraher/CardinalityShiftClustering