final

versiunea finala
Merge pull request #8 from Edeph/test

final