Merge branch 'master' of /home/wolf/Projekty/Java/ClassApplicatio with conflicts.
version 1.0
version 1.0