Merge pull request #4 from EcoForecast/master

I'm updating!
Merge pull request #5 from EcoForecast/master

updating my repository
Getting updated version
Added mean max min
Merge pull request #21 from AngelaRigden/master

Working on data model
Merge pull request #7 from EcoForecast/master

pulling angela's changes