updates
Merge branch 'master' of https://github.com/jmmaloney4/Science-Project-Fall-2014