Added a new Line
Changed new_file.txt
Changed new_file.txt
Merge branch 'master' of https://github.com/xcrons/test

Conflicts:
	new_file.txt