First commit
Merge https://github.com/kkincade/Cityscape

Merging.