SciPi Integration
Merge branch 'master' of https://github.com/joknowle/PHYS202-S14