commit before merge
Merge branch 'master' of https://github.com/huxiaolei/book_beaglebone

Conflicts:
	usingGit/common_cmd.md

merge from onlie edit