DELETE OLD FOLDER

Conflicts:
	Version-Control/step-three/MergeConflict.txt