initial commit
Merge https://github.com/simon-f/city-search

merge with initial state