merge conflict demo
demoing
resolved merge
Merge pull request #31 from margaretgodowns/margaretH1

Margaret h1
Merge pull request #30 from ansleyjones/ansleysass

Ansleysass
added ids to calendar
Merge pull request #32 from margaretgodowns/margaretH1

added ids to calendar
added event calendar event function