Revert "Merge branch 'master' of https://github.com/tannersmith1/SeniorProject"

This reverts commit c1b76ad6602adc15bf2f9ed0aa8265cecc0163de, reversing
changes made to ff53f1c693f54dfa27a76741c58eafe96befcf9f.
k