events + user stories
Merge pull request #151 from SW2A305/events-+-userstories

events + user stories