Readme
Merge branch 'master' into folders

Conflicts:
	README.md