Merge pull request #33 from GJST-Capstone/gregory

approved
adjust weather calls
Merge branch 'master' of github.com:GJST-Capstone/Capstone-Project
Merge pull request #34 from GJST-Capstone/stacy

Stacy
fixing merge confilit