ia version finale acceptable
yif
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/slot1.tablut