changed so cs will work
Merge branch 'master' of https://github.com/gcganley/Science-Project