BORDEL
test
Merge branch 'master' of https://github.com/sachabroute/MIASHS

Conflicts:
	__pycache__/game_options.cpython-32.pyc
Merge branch 'master' of https://github.com/sachabroute/MIASHS