More
Merge branch 'master' of https://github.com/peter666/git-started

Conflicts:
	newfile.txt