XXX
Merge branch 'master' of https://github.com/ZhanruiLiang/sys-analysis

Conflicts:
	player.py
typo fixed