fixing merge issues
fixed api bug yay
got weather to parse yay
changed temp to fahrenheit
added more files for temp
fixed conflicts
Merge pull request #9 from kil432/weather-api

Weather api