watermark
Merge branch 'master' of github.com:spanner/fellrace2
no graph until positioning sorted out
merged