Resolves #3
Merge pull request #5 from chesleybrown/fixes-waffle-badge

Resolves #3
Merge remote-tracking branch 'origin/master' into fix-something

Conflicts:
	README.md