Merge pull request #11 from caitlinvangundy/master

Calendar page
Merge pull request #5 from emrickgarrett/master

Merge pull request #11 from caitlinvangundy/master