add waffle.io badge
Merge pull request #16 from waffle-iron/master

waffle.io Badge
Merge branches 'master' and 'develop' into develop