Merge pull request #152 from jayfo/calendar

Add feedback session to calendar