Merge pull request #1 from anniedaniel/master

added citylist page, lots of data issues, so many css issues
moved json
fixed models to line up with json