updated readme with a FAQ answer
merging README changes

Conflicts:
	README.rst