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

Conflicts:
	bin/sdu/ir/simulate/DiffusionSimulate_test.class