Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated manifest--can now make it all the way to heart rate without crashing
it all works!
Merge pull request #5 from allegralarche/master

everything works!