add waffle.io badge
copying readme
Merge pull request #1 from waffle-iron/master

waffle.io Badge
Update README.rst
Fixed README
fixed merge
fixing master readme
Fixed the README so that it is consistent with the test files.
fixed merges