vide
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/options.tablut
Merge branch 'master' of https://github.com/proto3/Manhattan.git
Rien
Merge branch 'master' of https://github.com/proto3/Manhattan.git
Merge branch 'master' of https://github.com/proto3/Manhattan.git
repare cas de victoire!
Merge branch 'master' of https://github.com/proto3/Manhattan.git