added master entry
Merge branch 'otherBranch'

Conflicts:
	README.md
my new changes
next other branch
merged