-conflicts
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/Main.py
Merge branch 'master' of https://github.com/Redoxee/city_creator_esgi.git
Merge branch 'master' of https://github.com/Redoxee/city_creator_esgi.git
Merge branch 'master' of https://github.com/Redoxee/city_creator_esgi.git
- Serialization done!
-merge main
- Deserialization done!
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/Main.py