new
master
Merge branch 'newBranch'

Conflicts:
	readme.md