still a bit bugged version
Merge branch 'master' of https://github.com/Szoftverfolyamatok1/SzF1