Added events and rooms
Merge pull request #6 from mkelland/develop

Added events and rooms