fooling around with the calendar
resolves merge conflict
changes forecast to f from celsius
Merge pull request #8 from xtina-starr/tool-library

Tool library
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
adds signout button and only permits logged-in users to post to/access calendar
finished adding things to the header
adds features to front page
Merge pull request #10 from xtina-starr/layout

Layout
merged and fixed merge conflicts
admin access
made current_user an instance method
wrote specs for AdminController
logged out users can see the tool library
idk