made change to _weather.html.erb so it would work
fixed merge conflict in _weather