add note
Merge branch 'master' into a

Conflicts:
	README.md