new 2
new 1
Merge branch 'one'

Conflicts:
	cewwwsww.txt
all new