added line to readme
added to readme
added line to readme
Merge branch 'master' into 1.1

Conflicts:
	README.md