update readme2
update readme
resolved merge conflicts
Merge remote-tracking branch 'origin/qa/1' into qa/1-1

Conflicts:
	README2.md