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
made change to _weather.html.erb so it would work
fixing temp converter
Merge pull request #10 from kil432/weather-api

fixing temp converter
added forecast still formating
displaying forecast working on sorting
forecast up
Merge pull request #11 from kil432/weather-api

Weather api
fixed weather html conflicts
Merge branch 'addCalendar'
calendar works with month included
works, calendar can scroll months
fixed merge conflict in _weather
Merge branch 'master' into addCalendar