new one branch merge
Merge branch 'new_one'

Conflicts:
	README.md