primul commit
Merge branch 'master' of https://github.com/gbogdan/dev