adds weather partial and helper
adds more weather info
adds icon to weather info
fixed merge conflicts
fixes more merge conflicts, moves weather to bottom of page
gives weather a white background, rounded corners
Merge pull request #20 from ahsterling/steph

Steph
Merge branch 'master' into weather
Merge pull request #21 from ahsterling/weather

Weather
Merge branch 'master' into steph