Second partial
Merge branch 'master' of https://github.com/rachelleism/SCITECH
apparently it is necessary to merge