change6
resolved conflicts
Merge pull request #4 from CatalinFrancuTest/master

pull request after resolving conflicts