Resolved merge conflicts
Yay pictures
Yay more pictures
Merge branch 'master' of https://github.com/RascalSeniorDesign/Preliminary-Design