Better Nav bar

fixed it
All caps

It looks nicer this way
Added descriptions for tourist sites
Updated descriptions
Fixed conflicts
Merge pull request #1 from jsussman22/Scoopadoop-master

Commit changes made