Merge remote-tracking branch 'origin/bis'

Conflicts:
	__pycache__/game_options.cpython-32.pyc
	napoleon.py