Pulling data from weather underground and using static data when not in production.
Resolving merge conflicts.
Merge branch 'master' of github.com:emmceemoore/ospi-website