Update Bitmap Plon33r
update
Merge pull request #28 from Arthur26/sprint2

Sprint2
update
update
update
Merge pull request #29 from thomasE1993/sprint2

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

Sprint2