11
Merge remote-tracking branch 'origin/master'

Conflicts:
	QtCppE/main.cpp
	QtCppE/ruminations_8_2.cpp