am modificat functia x
Merge branch 'master' of https://github.com/alexcionca/test

Conflicts:
	README.md