fooling around with the calendar
resolves merge conflict
changes forecast to f from celsius
Merge branch 'master' of github.com:xtina-starr/peapatch into posts
OMFG CALENDAR ADDING WORKS
calendar is working
Merge pull request #9 from xtina-starr/calendar

Calendar