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

Conflicts:
	CardinalityShift/src/LSHDecoder.c
	CardinalityShift/src/RPHashCluster.c
	CardinalityShift/src/test/LSHTests.c
	CardinalityShift/src/test/a.out
eclipse is still mad at git
Merge branch 'master' of https://github.com/leecarraher/CardinalityShiftClustering.git