Test commit.
Merge branch 'master' into TestBranch

Conflicts:
	README.md
Merge pull request #1 from PaulDib/TestBranch

Test commit.