Newfile modification
Merge branch 'getnewfile'
conflict fixed
Conflicts:
	newfile.txt
newfile save 2