Push for Marion - icons
Merge branch 'master' of https://github.com/jianyaoang/Trip-InChicago
jaime