changed readme for this branch too
Merge branch 'master' into grenis

Conflicts:
	README.md