Merge pull request #11 from caitlinvangundy/master

Calendar page