edit readme.txt 010AC
merge from FETCH_HEAD

Conflicts:
	readme.txt