not sure what i did but whatever
Merge remote-tracking branch 'origin/master' into displayWeedkDayName
weekly forecast view controller code complete!