master
Merge branch 'b'

Conflicts:
	README.md