WIP of beat meter
Merge branch 'master' of github.com:maxlgilbert/Dreamcatcher
Adding beat meter functionality
Merge conflict fix