Added beat detection. Still needs work on edges.
Merge remote-tracking branch 'origin/master'