Here is a commit message
Merge branch 'master' of github.com:jeremymills/Test

Conflicts:
	README.md
New files