Merge
Merge branch 'master' of https://github.com/3a-arthurkevin/CardGame

Conflicts:
	Project/CardGame/src/Card.py
	Project/CardGame/src/Servant.py
	Project/CardGame/src/main.py
Merge branch 'master' of https://github.com/3a-arthurkevin/CardGame
Changement de certaine phrase dans le txt
Merge branch 'master' of https://github.com/3a-arthurkevin/CardGame

Conflicts:
	Documents/Unit.txt