tog bort rader
Merge branch 'master' into btest