updata
Merge branch 'master' of github.com:weedbitter/learn

Conflicts:
	README.md
update