update
typo
Merge branch 'master' into HEAD

Conflicts:
	README.md
Merge branch 'temp'