Fred et Christo Refactor XML shit
Fred et Christo 2
Chris et Fred 3 (LOSTI DE SUO QUI A MIT CA)
git correction
Merge branch 'master' into Fred

Conflicts:
	.gitignore
	Ift232Tests/TestBuilding.cs
	ProjetIft232.v12.suo
	ProjetIft232/Buildings/Building.cs
	ProjetIft232/Buildings/BuildingFactory.cs
	ProjetIft232/Buildings/BuildingType.cs
	ProjetIft232/Buildings/Carry.cs
	ProjetIft232/Buildings/Casern.cs
	ProjetIft232/Buildings/Farm.cs
	ProjetIft232/Buildings/House.cs
	ProjetIft232/Buildings/Mine.cs
	ProjetIft232/Buildings/Requirement.cs
	ProjetIft232/Buildings/SawMill.cs
	ProjetIft232/Buildings/School.cs
	ProjetIft232/City.cs
	ProjetIft232/ConsoleUi.cs
	ProjetIft232/Game.cs
	ProjetIft232/Player.cs
	ProjetIft232/ProjetIft232.csproj
	ProjetIft232/Resources.cs
Merge branch 'Fred'