Merge pull request #1 from marian-margeta/feature2

Feature2
mmm
Merge branch 'x' into feature2

Conflicts:
	ss.txt