edited main & core.cpp
Merge branch 'Dev' of https://github.com/idrol/CityGame