Merge pull request #63 from ns-uw/master

Update events and teams