?
Merge branch 'master' of https://github.com/blaavogn/BFST
Mergeing problemanalyse and main
Conflict resolved