added
changed
changed again
new
Merge remote-tracking branch 'upstream/master'

Conflicts:
	newfile.txt