more pretty stuff
Merge branch 'master' of https://github.com/NCSUWebClass/spring14-walkyourcity1