New line
Merge branch 'master' of https://github.com/Roxana28/MyFirstRepository

Conflicts:
	Some_text.txt