implemented
fix
Merge branch 'dev' of https://github.com/ScrumPBL/team1 into feature-13
changed activity name
Merge pull request #24 from ScrumPBL/feature-13

Feature 13