Test 1 Local Commit 1
Merge branch 'master' of git://github.com/peterstaplesMW/Test1

Conflicts:
	README.md
Message