Merge https://github.com/maxcn/myproject into newBranch

Conflicts:
	README
add new file
Merge branch 'master' of https://github.com/maxcn/myproject into newBranch

Conflicts:
	file
add
add
manually change conflict