-test commit
- test edit conflict
Merge branch 'master' of
https://github.com/Redoxee/city_creator_esgi.git

Conflicts:
	CityGenerator/Sources/dummy.py