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

Conflicts:
	bin/sdu/ir/simulate/DiffusionSimulate_test.class
Merge branch 'master' of https://github.com/dongyaQin/graduateProject.git
12
Merge branch 'master' of https://github.com/dongyaQin/graduateProject.git
1