modified:   cpp/chap3/str.cc
Merge branch 'master' of https://github.com/richard28530/Mystuff
xxxxxxx

Conflicts:
	cpp/chap3/str.cc