slet jakob
Merge origin/master
slet jakob