added file 2
Merge branch '2b'

Conflicts:
	1
clean file 1