deleted old testfile
added timezone to city
Merge branch 'master' of github.com:bgotink/CPL