updates from a while back.
updating after conflict in fourStrainModel.R

Merge branch 'master' of github.com:nickreich/pompSandbox

Conflicts:
	fourStrainModel/fourStrainModel.R