new-beached… !!!
Merge branch 'new-1'

Conflicts:
	a.txt