Merge pull request #9 from xtina-starr/calendar

Calendar
moved to UserController
added user and admin routes
added user and admin routes
moved user_email spec to user controller spec
created admin controller spec
added user_email spec
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
Merge pull request #11 from xtina-starr/layout

Layout
Merge pull request #12 from xtina-starr/admin

Admin
adds somre more formatting