clean project
fixed merge conflicts
added the functionality to get the average beats per min