on mynewbranch
more changes on newbranch
added newbranch_file to newbranch
Merge branch 'mynewbranch'

Conflicts:
	readme