Merge pull request #1 from EcoForecast/master

new stuff
Takes data from SS model instead of making it up
Merge pull request #35 from HollieEmery/master

takes r form SS model