Resolve "conflict" in .gitignore
Add coveralls
Badges
Merge pull request #52 from kennknowles/coveralls

Coveralls