Added 2nd line
Merge branch 'clean_up2'

Conflicts:
	ws1/file_2