delete

Conflicts:
	oji testing.txt