a
Merge branch 'master' of https://github.com/wangjohn/network_epidemics

Conflicts:
	paper/paper.aux
	paper/paper.log
	paper/paper.pdf
Merge branch 'master' of https://github.com/wangjohn/network_epidemics

Conflicts:
	paper/paper.log
	paper/paper.pdf
jdjdjdd
final edits
edits