Test commit 3
Test commit 3b
Merge branch 'dev' into alexb-test1

Conflicts:
	README.md