Merge pull request #1 from waffle-iron/master

waffle.io Badge