add readme for github
Merge branch '1.12'

Conflicts:
	README.md