elso proba
Merge branch 'master' of https://github.com/Buzavirag/Proba1