d3update

d3update
Merge branch 'master' of https://github.com/WangCHX/big_data_project

Conflicts:
	.DS_Store