Revert "Revert "1""

This reverts commit 20dfdfc6a1cacf4a19833b35b6129cdc989a9589.
Merge branch 'master' of https://github.com/Jswk1/Java-projekt