Altered some stuff
Merge branch 'master' of https://github.com/Swarthmore/SEED_test
Merge branch 'master' of https://github.com/Swarthmore/SEED_test