finally
finally

Merge branch 'master' of https://github.com/EcoForecast/TeamGOATS

# Conflicts:
#	README.md

EcoForecast/TeamGOATS,kellyschroeder/TeamGOATS,EcoForecast/TeamGOATS,kellyschroeder/TeamGOATS