Merge pull request #10 from ansleyjones/ansleysass

Ansleysass
Merge pull request #11 from ansleyjones/ansleysass

Added styling, fixed template and js
 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
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 more styling