adds zero crossing rate
fixes merge conflicts, adds to the readme
fixes merge conflict
Merge pull request #39 from hughrawlinson/zcr

Zcr