user stories
Merge pull request #2 from maijake/master

user stories