fow per player in progress
fow + unit stack
merged
Merge branch 'aceltis'

Conflicts:
	Civilization/CivilizationLib/GeneratedCode/Implementation/Case.cs
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.pdb
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.pdb
	Civilization/CivilizationWPF/GameWindow.xaml.cs
fow fixed
Merge branch 'master' of https://github.com/Aceltis/ProjetPoo
parce qu'il faut
Merge branch 'master' of https://github.com/Aceltis/ProjetPoo

Conflicts:
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.pdb
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.pdb
randomized player order, default player number bugfix, hidden map between turns, reveal map at the end of the game
positions initiales
initial positions randomized
4players randomization bug fixed
pre merge
Merge branch 'master' of https://github.com/Aceltis/ProjetPoo

Conflicts:
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.pdb
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.pdb