padding is now 15px
Merge pull request #3 from jojolittleone/master

padding is now 15px
resolved conflict