Merge pull request #8 from aneurycasado/master

Changes
home screen styling, changed marker images, changed styling on pages
Merge pull request #10 from mferraco/master

home screen styling, changed marker images, changed styling on pages
got navbar in on city pages
Merge pull request #12 from mferraco/master

got navbar in on city pages