5
Merge branch 'newBranch'

Conflicts:
	README.md