Mise à jour again
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/fonctions_generales.cpython-32.pyc
	__pycache__/game_options.cpython-32.pyc
	__pycache__/golf.cpython-32.pyc
	__pycache__/napoleon.cpython-32.pyc
	__pycache__/solitaire.cpython-32.pyc
	images/menus/Thumbs.db
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/fonctions_generales.cpython-32.pyc
	__pycache__/game_options.cpython-32.pyc
	__pycache__/napoleon.cpython-32.pyc
	__pycache__/solitaire.cpython-32.pyc
	images/Thumbs.db
	images/menus/Thumbs.db
Merge branch 'master' of https://github.com/sachabroute/MIASHS

Conflicts:
	__pycache__/fonctions_generales.cpython-32.pyc
	__pycache__/game_options.cpython-32.pyc
	__pycache__/napoleon.cpython-32.pyc
	__pycache__/solitaire.cpython-32.pyc
	images/Thumbs.db