Branch first commit
Branch second commit
Branch third commit
Merge branch 'master' into newBranch

Conflicts:
	README.md
Merge pull request #1 from robertpainsi/newBranch

Merge branch master