update from macpro
Merge branch 'master' of github.com:nesalang/cpp

Conflicts:
	ch11/vec.cpp