Commit renew
Merge branch 'master' of ssh://github.com/Wadjetz/python-game-cards

Conflicts:
	src/engine/CarteServiteur.py
	src/engine/CarteSort.py
	src/engine/Entity.py
	src/engine/Pioche.py
	src/engine/Player.py
	src/engine/Serviteur.py
	src/engine/Terrain.py
	src/engine/main.py
	src/network/__init__.py
	src/save/Cartes