Fix typo
Merge branch 'master' of github.com:danascheider/canto
Add Test Coverage badge
Resolve stupid merge conflict which is dumb because I wasn't even trying to merge