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

Conflicts:
	MacManes.Res_Strategy.tex