- test commit de 5 fichiers
- merge de 5 fichiers
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/Block.py
	CityGenerator/Sources/District.py
	CityGenerator/Sources/FieldClipper.py
	CityGenerator/Sources/ManhattanClipper.py