Aslak is pulling stuff
Merge branch 'master' of https://github.com/blaavogn/BFST
Conflict resolved