- create CityGen directory if not exists
- file in deserialize
- resolution de conflits
Merge branch 'master' of https://github.com/Redoxee/city_creator_esgi.git