Merge pull request #3 from marcecaro/other_conflict

Other conflict
sfdds
Merge branch 'master' of https://github.com/marcecaro/Test
Merge branch 'master' into marce_dc

Conflicts:
	README.md