Merge pull request #11 from lolPix/master

mergemerge
Merge pull request #33 from lolPix/master

mergemeerge
changed design
Merge pull request #34 from lolPix/design

Changed design