1124
Merge branch 'master' of https://github.com/macmanes/P20-COBRE

Conflicts:
	.texpadtmp/MacManes.Res_Strategy.log
	.texpadtmp/MacManes.Res_Strategy.synctex.gz
	MacManes.Res_Strategy.pdf