Aha
Merge branch 'master' of https://github.com/daizuozhuo/CustomerPrediction

Conflicts:
	README.md
	main.py
nothing new
Merge branch 'master' of https://github.com/daizuozhuo/CustomerPrediction