bug fixed version 1.1 for production
resolve merge conflict
added city to Dan class, completed coding