Merge branch 'master' of https://github.com/xchenmeow/glowing-ironman

Conflicts:
	ChairsSurvival.py
Merge branch 'master' of https://github.com/xchenmeow/glowing-ironman

Conflicts:
	ChairsSurvival.py