README.md
Merge branch 'master' into JP

Conflicts:
	TestGit/README.md