calculations take more factors into account for fossil fuels
Merge branch 'master' of github.com:scottopell/orinoquia-industries

Conflicts:
	orinoquia.nlogo
recreates some monitors lost in the merge
tweaks fossil fuels a bit more
Merge branch 'master' of github.com:scottopell/orinoquia-industries

Conflicts:
	orinoquia.nlogo