daily update
Merge branch 'master' of https://github.com/mclxly/study

Conflicts:
	setup/cmd.txt