Working on resolving zoom issues
Merge branch 'master' of https://github.com/jianyaoang/Trip-InChicago

pulled Jay's stuff