Merge branch 'master' of C:\Users\Ludvig\KarateParty with conflicts.
judojuking final
judojuking final
judojuking final