temp
tempMerge branch 'master' of https://github.com/wangjohn/network_epidemics

Conflicts:
	game.py
a
static_infection
static_infection
boob
static_infection
Merge branch 'master' of https://github.com/wangjohn/network_epidemics