Revert "Merge branch 'master' of https://github.com/Yinchcactus/ElevatorQuarterProjectRevised"

This reverts commit 6577f8930bef5262f08dea2381a8102a88591d44, reversing
changes made to 4cc50d2395888c254f99214dfe9f15d4603aa43a.