did stuff
fixing conflicts
added calendar
Merge branch 'master' of github.com:tiy-chs-q4-fee/rageCake into Calendar
Merge pull request #12 from wgallop99/Calendar

Calendar
added getStaged form
have events displaying on all "tab". adding location tabs and will have them display by click
Merge pull request #14 from aelevy44/event2

Event2
Fixed sidebar to display only events for tonight
Merge pull request #13 from margaretgodowns/margaretH1

Margaret h1
fixed more styling
fixed styling
Merge pull request #15 from ansleyjones/ansleysass

Ansleysass
added location specific lists
Merge pull request #16 from aelevy44/event2

added location specific lists
added tab effect on the home and events tabs in the top nav bar
Merge pull request #17 from ansleyjones/ansleysass

added tab effect on the home and events tabs in the top nav bar
added blog posts
fixed conflicts
recompiled