baseline state, fixed subsidy modifiers in putparams.m
Merge branch 'master' of github.com:iamlemec/reallocation

Conflicts:
	calcss.m
	putparams.m