c++ 拾遗
Merge branch 'master' of github.com:jixiuf/org-mode-files

Conflicts:
	c/sth.org