...
Merge branch 'theGame' of https://github.com/FlorentBossart/theGame.git
into theGame

Conflicts:
	YAMLSlot/slot1.yaml