added nav bar
merge conflict
some change
Merge remote-tracking branch 'upstream/master' into margaretH1
Merge pull request #28 from wgallop99/master

css
Merge remote-tracking branch 'upstream/master' into margaretH1
readded div container
Merge pull request #29 from margaretgodowns/margaretH1

Margaret h1
Added styling
Merge branch 'master' of github.com:tiy-chs-q4-fee/rageCake into ansleysass
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 calendar event function
added event calendar event function
Merge pull request #33 from ansleyjones/ansleysass

Ansleysass