Flere Classes
Flere classes
Revert "Flere classes"

This reverts commit 672cdf90b99570baf428b08e543cc7bc0952e21d.
Merge remote-tracking branch 'origin/master' into Patrik