Added heartrate counter
Merge branch 'master' of https://github.com/ZaneHendrix/projectGreg
Solved conflicts