Changed oldfile
changed oldfile
Merge branch 'BeforeIDeleted'

Conflicts:
	oldfile.txt