Timeslots and location
Merge pull request #64 from madevr/madevr

Timeslots and location
Merge pull request #65 from madevr/master

Timeslots and location