README
Merge branch 'develop' of github.com:tchap/testrepo into develop

Conflicts:
	README