Merge pull request #5 from thomasE1993/master

Update
Merge pull request #5 from thomasE1993/sprint2

Merge pull request #5 from thomasE1993/master