some%20added
some%20else
Merge branch 'newbranch'

Conflicts:
	some.txt

ew
added in master
added in newb
yo
Revert "added in newb"

This reverts commit 3fba5835b875d83aca8086ce51bca3c47afef6a5.

y#

yooooo