Merge pull request #4 from emrickgarrett/master

asdf
asdf
Merge pull request #11 from caitlinvangundy/master

Calendar page