merge request

Daniel Tranberg Nikolajsenrequested to merge
DanielsBranch into master

rettet calculateHeartRate til. Klar til merge med masterbranch

Merge request reports