Merge stuff form my old computer
Merge branch 'master' of https://github.com/TeamMagnequasar/Thermal-Tinkerer
Try to recommit the changes I made (Merge stuff from my old computer)