Feladatok++
Merge branch 'zed'
Merge branch 'zed'
Corrected mistakes
Get upstream back in here!