Revert "Merge branch 'master' of https://github.com/dan-olsen/SeniorDesign"

This reverts commit fb62be529bc8ff07d7665f930bda945e031aa1d6, reversing
changes made to fabb99fbfd6ec2f85607f70d6f388d09bb89b8fd.