Merge pull request #5 from kil432/weather-api

Weather api
fixing merge issues
fixed api bug yay
got weather to parse yay
changed temp to fahrenheit