- merge files
 
 - modifications on classes for utf8 problems
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/Main.py