Merge branch 'Shawn'
Merge branch 'master' of https://github.com/AvogadroSG1/SCADASystem