Fix updates where Tom broke stuff
Merge branch 'master' of https://github.com/RascalSeniorDesign/Preliminary-Design
Actually fix what Tom broke