ok
Merge branch 'master' of github.com:mpaulin/HS_AI

Conflicts:
	src/cards.py