Merge pull request #30 from Arthur26/sprint2

Sprint2
Merge pull request #12 from itcc-li/sprint2

Merge pull request #30 from Arthur26/sprint2