GraphTest almost done
Merge branch 'master' of https://github.com/blaavogn/BFST
Testing... testing...
Merge branch 'master' of https://github.com/blaavogn/BFST
Testing almost done
conflict resolved