Påbörjat difficulty-tjottan
Merge remote-tracking branch 'origin/master'