Merge pull request #3 from EcoForecast/master

Getting updated project
Merge pull request #18 from AngelaRigden/master

Merge pull request #3 from EcoForecast/master