str.h update
Merge branch 'master' of github.com:nesalang/cpp

Conflicts:
	ch12/str.h