C++ Primer stuff
Merge branch 'master' of https://github.com/charlespittman/fuzzy-wight

Conflicts:
	cpp/primer_prec11/1/runpgms
	cpp/primer_prec11/noinput
	cpp/primer_prec11/runpgms