did stuff
fixing conflicts
have events displaying on all "tab". adding location tabs and will have them display by click
Merge pull request #14 from aelevy44/event2

Event2