Added weather. Merged Jacob's changes. HTML