Added Weather API
Fix merge conflicts
Merge pull request #8 from brandonjyuhas/show_weather

Added Weather API