new 1
Merge branch 'one'

Conflicts:
	cewwwsww.txt
all new
add new
new 3