updated userstories
merged changes