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

waffle.io Badge
Add circle badge
Merge pull request #14 from tuxedio/badge

Add circle badge
Fix merge conflicts from badges