Merge pull request #1 from itcc-li/sprint2

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

Sprint2
Merge pull request #5 from thomasE1993/master

Update
Merge pull request #5 from thomasE1993/sprint2

Merge pull request #5 from thomasE1993/master
renamed package
Merge pull request #6 from plon33r/sprint2

Sprint2
Merge pull request #7 from thomasE1993/master

Update
Update
Update
Update
.
ok
Update
Merge pull request #8 from thomasE1993/master

Update Sprint2
test
Merge pull request #9 from thomasE1993/master

test
Merge pull request #13 from thomasE1993/sprint2

Sprint2