modified:   debug.py
	modified:   game.py
	modified:   player.py
Merge branch 'master' of github.com:ZhanruiLiang/sys-analysis

Conflicts:
	game.py
Merge branch 'master' of github.com:ZhanruiLiang/sys-analysis