Laying the foundation for the City building.
Merge branch 'master' of https://github.com/frr171/TheSixthSun