12
Merge branch 'master' of
https://github.com/dongyaQin/graduateProject.git

Conflicts:
	src_influence/sdu/ir/diffusionmodel/ICM3_RecordDistance.java