Merge branch 'master' of C:\Users\Delda\Documents\programming\JAVA2\Brainiac_SzLab4 with conflicts.
Gombok.