merge?
whitespace lol
implemented a buggy beat detector
fixed merges for buggy beat detector