Merge pull request #7 from thomasE1993/master

Update
Merge pull request #8 from thomasE1993/master

Update Sprint2
Merge pull request #9 from thomasE1993/master

test