ip js file
error-message, box-shadow weather icon css class
weather and ip divs
local weather script
fixed merge conflict
js