clearup
Merge branch 'master' of https://github.com/TimDu/BioMining.git

Conflicts:
	BioMining/association_rules/apriori_algorithm.py