plan update
Merge branch 'friends' of github.com:mschuebel/fit into friends
plan update